diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
index 61d9d2827d..a2e9d506f4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.widget.TextView
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
+import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.MappingViewHolder
@@ -33,7 +34,7 @@ object BioTextPreference {
 
     override fun getSubhead1Text(): String? = recipient.combinedAboutAndEmoji
 
-    override fun getSubhead2Text(): String? = recipient.e164.orNull()
+    override fun getSubhead2Text(): String? = recipient.e164.transform(PhoneNumberFormatter::prettyPrint).orNull()
 
     override fun areContentsTheSame(newItem: RecipientModel): Boolean {
       return super.areContentsTheSame(newItem) && newItem.recipient.hasSameContent(recipient)
diff --git a/app/src/main/res/drawable/ic_chevron_down_icon_20.xml b/app/src/main/res/drawable/ic_chevron_down_icon_20.xml
new file mode 100644
index 0000000000..77d8a10151
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_down_icon_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/signal_icon_tint_primary"
+      android:pathData="M10,15.5l-8,-7.979l1.059,-1.062l6.941,6.923l6.941,-6.923l1.059,1.062l-8,7.979z"/>
+</vector>
diff --git a/app/src/main/res/drawable/show_more.xml b/app/src/main/res/drawable/show_more.xml
index 1c5bb8c11a..a54b83803e 100644
--- a/app/src/main/res/drawable/show_more.xml
+++ b/app/src/main/res/drawable/show_more.xml
@@ -6,5 +6,5 @@
             <padding android:right="8dp" android:bottom="8dp" android:left="8dp" android:top="8dp" />
         </shape>
     </item>
-    <item android:drawable="@drawable/ic_chevron_down_20" />
+    <item android:drawable="@drawable/ic_chevron_down_icon_20" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index f3d6e7d29c..da346e4a30 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -1,206 +1,211 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
+    android:layout_height="wrap_content">
 
-    <org.thoughtcrime.securesms.components.AvatarImageView
-        android:id="@+id/rbs_recipient_avatar"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ProgressBar
-        android:id="@+id/rbs_admin_action_busy"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/rbs_recipient_avatar"
-        app:layout_constraintEnd_toEndOf="@+id/rbs_recipient_avatar"
-        app:layout_constraintStart_toStartOf="@+id/rbs_recipient_avatar"
-        app:layout_constraintTop_toTopOf="@+id/rbs_recipient_avatar"
-        tools:visibility="visible" />
-
-    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-        android:id="@+id/rbs_full_name"
-        style="@style/Signal.Text.Headline.Medium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dsl_settings_gutter"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:textColor="@color/signal_text_primary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/rbs_recipient_avatar"
-        tools:text="Gwen Stacy" />
-
-    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-        android:id="@+id/rbs_about"
-        style="@style/Signal.Text.Body"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dsl_settings_gutter"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:gravity="center"
-        android:textColor="@color/signal_text_secondary"
-        app:emoji_forceCustom="true"
-        app:layout_constraintTop_toBottomOf="@id/rbs_full_name"
-        tools:text="🕷🕷🕷Hangin' on the web🕷🕷" />
+        tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
 
-    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-        android:id="@+id/rbs_username_number"
-        style="@style/Signal.Text.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dsl_settings_gutter"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:textColor="@color/signal_text_secondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rbs_about"
-        app:layout_goneMarginTop="8dp"
-        tools:text="\@spidergwen  +1 555-654-6657" />
+        <org.thoughtcrime.securesms.components.AvatarImageView
+            android:id="@+id/rbs_recipient_avatar"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="24dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/rbs_note_to_self_description"
-        style="@style/TextAppearance.Signal.Body2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dsl_settings_gutter"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:text="@string/ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation"
-        android:textAlignment="center"
-        android:textColor="@color/signal_text_primary"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rbs_username_number"
-        tools:visibility="visible" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rbs_note_to_self_description">
-
-        <include layout="@layout/conversation_settings_button_strip" />
-
-        <include layout="@layout/dsl_divider_item" />
-
-        <Button
-            android:id="@+id/rbs_block_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_block"
+        <ProgressBar
+            android:id="@+id/rbs_admin_action_busy"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
             android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_block_tinted_24"
+            app:layout_constraintBottom_toBottomOf="@+id/rbs_recipient_avatar"
+            app:layout_constraintEnd_toEndOf="@+id/rbs_recipient_avatar"
+            app:layout_constraintStart_toStartOf="@+id/rbs_recipient_avatar"
+            app:layout_constraintTop_toTopOf="@+id/rbs_recipient_avatar"
             tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/rbs_unblock_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/rbs_full_name"
+            style="@style/Signal.Text.Headline.Medium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dsl_settings_gutter"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
+            android:textColor="@color/signal_text_primary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/rbs_recipient_avatar"
+            tools:text="Gwen Stacy" />
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/rbs_about"
+            style="@style/Signal.Text.Body"
             android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_unblock"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dsl_settings_gutter"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
+            android:gravity="center"
+            android:textColor="@color/signal_text_secondary"
+            app:emoji_forceCustom="true"
+            app:layout_constraintTop_toBottomOf="@id/rbs_full_name"
+            tools:text="🕷🕷🕷Hangin' on the web🕷🕷" />
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/rbs_username_number"
+            style="@style/Signal.Text.Body"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dsl_settings_gutter"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
+            android:textColor="@color/signal_text_secondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rbs_about"
+            app:layout_goneMarginTop="8dp"
+            tools:text="\@spidergwen  +1 555-654-6657" />
+
+        <TextView
+            android:id="@+id/rbs_note_to_self_description"
+            style="@style/TextAppearance.Signal.Body2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dsl_settings_gutter"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="@dimen/dsl_settings_gutter"
+            android:text="@string/ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation"
+            android:textAlignment="center"
+            android:textColor="@color/signal_text_primary"
             android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_block_tinted_24"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rbs_username_number"
             tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/rbs_remove_from_group_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_remove_from_group"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_leave_tinted_24"
-            tools:visibility="visible" />
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rbs_note_to_self_description">
 
-        <Button
-            android:id="@+id/rbs_make_group_admin_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_make_admin"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_group_24"
-            tools:visibility="visible" />
+            <include layout="@layout/conversation_settings_button_strip" />
 
-        <Button
-            android:id="@+id/rbs_remove_group_admin_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_remove_as_admin"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_group_24"
-            tools:visibility="visible" />
+            <include layout="@layout/dsl_divider_item" />
 
-        <Button
-            android:id="@+id/rbs_add_to_group_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_group_24"
-            tools:text="@string/RecipientBottomSheet_add_to_a_group"
-            tools:visibility="visible" />
+            <Button
+                android:id="@+id/rbs_block_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_block"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_block_tinted_24"
+                tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/rbs_add_contact_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_add_to_contacts"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_plus_24"
-            tools:visibility="visible" />
+            <Button
+                android:id="@+id/rbs_unblock_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_unblock"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_block_tinted_24"
+                tools:visibility="visible" />
 
-        <Button
-            android:id="@+id/rbs_view_safety_number_button"
-            style="@style/Widget.Signal.Button.TextButton.Drawable"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/RecipientBottomSheet_view_safety_number"
-            android:visibility="gone"
-            app:drawableStartCompat="@drawable/ic_safety_number_24"
-            app:drawableTint="@color/signal_icon_tint_primary"
-            tools:visibility="visible" />
+            <Button
+                android:id="@+id/rbs_remove_from_group_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_remove_from_group"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_leave_tinted_24"
+                tools:visibility="visible" />
 
-    </LinearLayout>
+            <Button
+                android:id="@+id/rbs_make_group_admin_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_make_admin"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_group_24"
+                tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <Button
+                android:id="@+id/rbs_remove_group_admin_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_remove_as_admin"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_group_24"
+                tools:visibility="visible" />
+
+            <Button
+                android:id="@+id/rbs_add_to_group_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_group_24"
+                tools:text="@string/RecipientBottomSheet_add_to_a_group"
+                tools:visibility="visible" />
+
+            <Button
+                android:id="@+id/rbs_add_contact_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_add_to_contacts"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_plus_24"
+                tools:visibility="visible" />
+
+            <Button
+                android:id="@+id/rbs_view_safety_number_button"
+                style="@style/Widget.Signal.Button.TextButton.Drawable"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/RecipientBottomSheet_view_safety_number"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_safety_number_24"
+                app:drawableTint="@color/signal_icon_tint_primary"
+                tools:visibility="visible" />
+
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>