diff --git a/changelog.d/5099.misc b/changelog.d/5099.misc
new file mode 100644
index 0000000000..37294b5163
--- /dev/null
+++ b/changelog.d/5099.misc
@@ -0,0 +1 @@
+Make Space creation screens more consistent
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
index e1e555eace..e3e5fe7e45 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/Widget.Vector.TextView.HeadlineMedium"
+            style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -53,12 +53,23 @@
             android:layout_marginBottom="16dp"
             app:icon="@drawable/ic_member_small"
             app:iconTint="?vctr_content_secondary"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/changeLaterText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:subTitle="@string/create_spaces_private_teammates"
             app:title="@string/create_spaces_me_and_teammates" />
 
+        <TextView
+            android:id="@+id/changeLaterText"
+            style="@style/Widget.Vector.TextView.Body"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:gravity="center"
+            android:text="@string/create_spaces_you_can_change_later"
+            android:textColor="?vctr_content_secondary"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index b675ec9b30..dd448bc967 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -12,26 +12,14 @@
 
         <TextView
             android:id="@+id/headerText"
-            style="@style/Widget.Vector.TextView.Subtitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/create_spaces_type_header"
-            android:textColor="?vctr_content_secondary"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
             style="@style/Widget.Vector.TextView.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
             android:gravity="center"
             android:text="@string/create_spaces_choose_type_label"
             android:textColor="?vctr_content_primary"
             android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
-            app:layout_constraintTop_toBottomOf="@id/headerText"
-            app:layout_constraintVertical_bias="1" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/joinInfoHelpText"
@@ -42,7 +30,7 @@
             android:gravity="center"
             android:text="@string/create_spaces_join_info_help"
             android:textColor="?vctr_content_secondary"
-            app:layout_constraintBottom_toTopOf="@id/publicButton" />
+            app:layout_constraintTop_toBottomOf="@id/headerText" />
 
         <im.vector.app.features.spaces.create.WizardButtonView
             android:id="@+id/publicButton"