diff --git a/res/layout/labeled_edit_text_default.xml b/res/layout/labeled_edit_text_default.xml
index eb5a297e94..95d1a8886a 100644
--- a/res/layout/labeled_edit_text_default.xml
+++ b/res/layout/labeled_edit_text_default.xml
@@ -5,7 +5,10 @@
     android:id="@+id/input"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
+    android:paddingTop="7dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:background="@color/transparent"
     android:singleLine="true"
     tools:text="Peter Parker"/>
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index ea22a1ab98..3514c97d19 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -12,171 +12,171 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.constraint.ConstraintLayout
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1">
 
-            <TextView
-                android:id="@+id/title"
-                style="@style/Signal.Text.Headline.Registration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/CreateProfileActivity_set_up_your_profile"
-                app:layout_constraintBottom_toTopOf="@+id/name"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.0"
-                app:layout_constraintVertical_chainStyle="spread_inside" />
-
-            <ImageView
-                android:id="@+id/avatar_background"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_marginStart="32dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginTop="4dp"
-                android:src="@drawable/circle_tintable"
-                android:tint="@color/core_grey_05"
-                app:layout_constraintBottom_toBottomOf="@+id/name"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/name" />
-
-            <ImageView
-                android:id="@+id/avatar_placeholder"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:src="@drawable/ic_profile_default"
-                android:tint="@color/core_grey_60"
-                android:transitionName="avatar"
-                app:layout_constraintBottom_toBottomOf="@+id/avatar_background"
-                app:layout_constraintEnd_toEndOf="@+id/avatar_background"
-                app:layout_constraintStart_toStartOf="@+id/avatar_background"
-                app:layout_constraintTop_toTopOf="@+id/avatar_background" />
-
-            <ImageView
-                android:id="@+id/avatar"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="@+id/avatar_background"
-                app:layout_constraintEnd_toEndOf="@+id/avatar_background"
-                app:layout_constraintStart_toStartOf="@+id/avatar_background"
-                app:layout_constraintTop_toTopOf="@+id/avatar_background" />
-
-            <ImageView
-                android:id="@+id/camera_icon"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_marginStart="35dp"
-                android:layout_marginLeft="35dp"
-                android:layout_marginTop="35dp"
-                android:cropToPadding="false"
-                android:src="@drawable/ic_profile_camera"
-                app:layout_constraintStart_toStartOf="@+id/avatar_background"
-                app:layout_constraintTop_toTopOf="@+id/avatar_background" />
-
-            <org.thoughtcrime.securesms.components.LabeledEditText
-                android:id="@+id/name"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginEnd="4dp"
-                android:layout_marginRight="4dp"
-                android:layout_weight="1"
-                android:hint="@string/profile_create_activity__your_name"
-                app:labeledEditText_background="?attr/conversation_background"
-                app:labeledEditText_label="@string/CreateProfileActivity_profile_name"
-                app:labeledEditText_textLayout="@layout/profile_name_text"
-                app:layout_constraintBottom_toTopOf="@+id/description_text"
-                app:layout_constraintEnd_toStartOf="@+id/emoji_toggle"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/avatar_background"
-                app:layout_constraintTop_toBottomOf="@+id/title" />
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                android:id="@+id/emoji_toggle"
-                android:layout_width="37dp"
-                android:layout_height="37dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="9dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginRight="32dp"
-                android:background="@drawable/touch_highlight_background"
-                android:contentDescription="@string/conversation_activity__emoji_toggle_description"
-                app:layout_constraintBottom_toBottomOf="@+id/name"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/name" />
-
-            <TextView
-                android:id="@+id/description_text"
-                style="@style/Signal.Text.Preview"
+            <android.support.constraint.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginRight="32dp"
-                android:layout_marginBottom="16dp"
-                android:gravity="center"
-                android:text="@string/CreateProfileActivity_signal_profiles_are_end_to_end_encrypted"
-                android:textColor="@color/core_grey_60"
-                app:layout_constraintBottom_toTopOf="@+id/finish_button"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/name"
-                app:layout_constraintVertical_bias="1.0" />
+                android:layout_height="wrap_content">
 
-            <com.dd.CircularProgressButton
-                android:id="@+id/finish_button"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="32dp"
-                android:layout_marginLeft="32dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginRight="32dp"
-                android:background="@color/signal_primary"
-                android:textAllCaps="true"
-                android:textColor="@color/white"
-                app:cpb_colorIndicator="@color/white"
-                app:cpb_colorProgress="@color/textsecure_primary"
-                app:cpb_cornerRadius="4dp"
-                app:cpb_selectorIdle="@drawable/progress_button_state"
-                app:cpb_textIdle="@string/profile_create_activity__finish"
-                app:layout_constraintBottom_toTopOf="@+id/skip_button"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                <TextView
+                    android:id="@+id/title"
+                    style="@style/Signal.Text.Headline.Registration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:text="@string/CreateProfileActivity_set_up_your_profile"
+                    app:layout_constraintBottom_toTopOf="@+id/name"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.0"
+                    app:layout_constraintVertical_chainStyle="spread_inside" />
 
-            <Button
-                android:id="@+id/skip_button"
-                style="@style/Button.Borderless.Registration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/profile_create_activity__set_later"
-                android:textColor="@color/gray50"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                <ImageView
+                    android:id="@+id/avatar_background"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginLeft="32dp"
+                    android:layout_marginTop="4dp"
+                    android:src="@drawable/circle_tintable"
+                    android:tint="@color/core_grey_05"
+                    app:layout_constraintBottom_toBottomOf="@+id/name"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/name" />
 
-        </android.support.constraint.ConstraintLayout>
+                <ImageView
+                    android:id="@+id/avatar_placeholder"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:src="@drawable/ic_profile_default"
+                    android:tint="@color/core_grey_60"
+                    android:transitionName="avatar"
+                    app:layout_constraintBottom_toBottomOf="@+id/avatar_background"
+                    app:layout_constraintEnd_toEndOf="@+id/avatar_background"
+                    app:layout_constraintStart_toStartOf="@+id/avatar_background"
+                    app:layout_constraintTop_toTopOf="@+id/avatar_background" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiDrawer xmlns:android="http://schemas.android.com/apk/res/android"
+                <ImageView
+                    android:id="@+id/avatar"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="@+id/avatar_background"
+                    app:layout_constraintEnd_toEndOf="@+id/avatar_background"
+                    app:layout_constraintStart_toStartOf="@+id/avatar_background"
+                    app:layout_constraintTop_toTopOf="@+id/avatar_background" />
+
+                <ImageView
+                    android:id="@+id/camera_icon"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_marginStart="35dp"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginTop="35dp"
+                    android:cropToPadding="false"
+                    android:src="@drawable/ic_profile_camera"
+                    app:layout_constraintStart_toStartOf="@+id/avatar_background"
+                    app:layout_constraintTop_toTopOf="@+id/avatar_background" />
+
+                <org.thoughtcrime.securesms.components.LabeledEditText
+                    android:id="@+id/name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_weight="1"
+                    android:hint="@string/profile_create_activity__your_name"
+                    app:labeledEditText_background="?attr/conversation_background"
+                    app:labeledEditText_label="@string/CreateProfileActivity_profile_name"
+                    app:labeledEditText_textLayout="@layout/profile_name_text"
+                    app:layout_constraintBottom_toTopOf="@+id/description_text"
+                    app:layout_constraintEnd_toStartOf="@+id/emoji_toggle"
+                    app:layout_constraintHorizontal_bias="0.5"
+                    app:layout_constraintStart_toEndOf="@+id/avatar_background"
+                    app:layout_constraintTop_toBottomOf="@+id/title" />
+
+                <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                    android:id="@+id/emoji_toggle"
+                    android:layout_width="37dp"
+                    android:layout_height="37dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginTop="9dp"
+                    android:layout_marginEnd="32dp"
+                    android:layout_marginRight="32dp"
+                    android:background="@drawable/touch_highlight_background"
+                    android:contentDescription="@string/conversation_activity__emoji_toggle_description"
+                    app:layout_constraintBottom_toBottomOf="@+id/name"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/name" />
+
+                <TextView
+                    android:id="@+id/description_text"
+                    style="@style/Signal.Text.Preview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginLeft="32dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="32dp"
+                    android:layout_marginRight="32dp"
+                    android:layout_marginBottom="16dp"
+                    android:gravity="center"
+                    android:text="@string/CreateProfileActivity_signal_profiles_are_end_to_end_encrypted"
+                    android:textColor="@color/core_grey_60"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/name"
+                    app:layout_constraintVertical_bias="1.0" />
+
+            </android.support.constraint.ConstraintLayout>
+
+        </ScrollView>
+
+        <com.dd.CircularProgressButton
+            android:id="@+id/finish_button"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="32dp"
+            android:layout_marginLeft="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginRight="32dp"
+            android:background="@color/signal_primary"
+            android:textAllCaps="true"
+            android:textColor="@color/white"
+            app:cpb_colorIndicator="@color/white"
+            app:cpb_colorProgress="@color/textsecure_primary"
+            app:cpb_cornerRadius="4dp"
+            app:cpb_selectorIdle="@drawable/progress_button_state"
+            app:cpb_textIdle="@string/profile_create_activity__finish" />
+
+        <Button
+            android:id="@+id/skip_button"
+            style="@style/Button.Borderless.Registration"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/profile_create_activity__set_later"
+            android:textColor="@color/gray50" />
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
             android:id="@+id/emoji_drawer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/profile_name_text.xml b/res/layout/profile_name_text.xml
index 4d4542ceab..ea33bb90fb 100644
--- a/res/layout/profile_name_text.xml
+++ b/res/layout/profile_name_text.xml
@@ -5,7 +5,10 @@
     android:id="@+id/input"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
+    android:paddingTop="7dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:background="@color/transparent"
     android:singleLine="true"
     android:inputType="textCapWords"