diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
index d6e9b45a03..df87fbbc49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java
@@ -59,7 +59,6 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
     this.bodyView   = view.findViewById(R.id.edit_about_body);
     this.countView  = view.findViewById(R.id.edit_about_count);
 
-
     view.<Toolbar>findViewById(R.id.toolbar)
         .setNavigationOnClickListener(v -> Navigation.findNavController(view)
                                                      .popBackStack());
@@ -76,6 +75,7 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
     });
 
     view.findViewById(R.id.edit_about_save).setOnClickListener(this::onSaveClicked);
+    view.findViewById(R.id.edit_about_clear).setOnClickListener(v -> onClearClicked());
 
     if (savedInstanceState != null && savedInstanceState.containsKey(KEY_SELECTED_EMOJI)) {
       onEmojiSelected(savedInstanceState.getString(KEY_SELECTED_EMOJI, ""));
@@ -98,6 +98,9 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
     if (drawable != null) {
       this.emojiView.setImageDrawable(drawable);
       this.selectedEmoji = emoji;
+    } else {
+      this.emojiView.setImageResource(R.drawable.ic_add_emoji);
+      this.selectedEmoji = "";
     }
   }
 
@@ -125,7 +128,12 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity
     });
   }
 
-  public static void trimFieldToMaxByteLength(Editable s) {
+  private void onClearClicked() {
+    bodyView.setText("");
+    onEmojiSelected("");
+  }
+
+  private static void trimFieldToMaxByteLength(Editable s) {
     int trimmedLength = StringUtil.trimToFit(s.toString(), ProfileCipher.MAX_POSSIBLE_ABOUT_LENGTH).length();
 
     if (s.length() > trimmedLength) {
diff --git a/app/src/main/res/layout/edit_about_fragment.xml b/app/src/main/res/layout/edit_about_fragment.xml
index bca8928a5d..c0b83e278f 100644
--- a/app/src/main/res/layout/edit_about_fragment.xml
+++ b/app/src/main/res/layout/edit_about_fragment.xml
@@ -35,14 +35,25 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="8dp"
-      android:layout_marginEnd="24dp"
+      android:layout_marginEnd="8dp"
       style="@style/Signal.Text.Body"
       android:hint="@string/EditAboutFragment_write_a_few_words_about_yourself"
       android:inputType="textCapSentences"
       android:maxLines="1"
       app:layout_constraintTop_toBottomOf="@id/toolbar"
       app:layout_constraintStart_toEndOf="@id/edit_about_emoji"
-      app:layout_constraintEnd_toEndOf="parent"/>
+      app:layout_constraintEnd_toStartOf="@id/edit_about_clear"/>
+
+  <ImageView
+      android:id="@+id/edit_about_clear"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="20dp"
+      app:srcCompat="@drawable/ic_x"
+      app:tint="@color/signal_text_secondary"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="@id/edit_about_body"
+      app:layout_constraintBottom_toBottomOf="@id/edit_about_body"/>
 
   <TextView
       android:id="@+id/edit_about_count"