diff --git a/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml b/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
index 10c7f4cbc3..31976bad74 100644
--- a/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
+++ b/vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
@@ -45,55 +45,11 @@
                 app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeTitle" />
 
             <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/promptSimplifiedModeOn"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/bg_login_server_selector"
-                android:contentDescription="@string/prompt_simplified_mode_on"
-                android:paddingTop="@dimen/layout_vertical_margin"
-                android:paddingBottom="@dimen/layout_vertical_margin"
-                android:paddingStart="@dimen/layout_horizontal_margin"
-                android:paddingEnd="@dimen/layout_horizontal_margin"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeText">
-
-                <TextView
-                    android:id="@+id/promptSimplifiedModeOnTitle"
-                    style="@style/Widget.Vector.TextView.Body"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="start"
-                    android:text="@string/prompt_simplified_mode_on"
-                    android:textColor="?vctr_content_primary"
-                    android:textSize="16sp"
-                    app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOnText"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
-
-                <TextView
-                    android:id="@+id/promptSimplifiedModeOnText"
-                    style="@style/Widget.Vector.TextView.Caption"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:gravity="start"
-                    android:text="@string/prompt_simplified_mode_on_text"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeOnTitle" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/promptSimplifiedModeOff"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_vertical_margin"
+                android:layout_marginTop="24dp"
                 android:background="@drawable/bg_login_server_selector"
                 android:contentDescription="@string/prompt_simplified_mode_off"
                 android:paddingTop="@dimen/layout_vertical_margin"
@@ -102,7 +58,7 @@
                 android:paddingEnd="@dimen/layout_horizontal_margin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeOn">
+                app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeText">
 
                 <TextView
                     android:id="@+id/promptSimplifiedModeOffTitle"
@@ -133,6 +89,51 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/promptSimplifiedModeOn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/layout_vertical_margin"
+                android:background="@drawable/bg_login_server_selector"
+                android:contentDescription="@string/prompt_simplified_mode_on"
+                android:paddingTop="@dimen/layout_vertical_margin"
+                android:paddingBottom="@dimen/layout_vertical_margin"
+                android:paddingStart="@dimen/layout_horizontal_margin"
+                android:paddingEnd="@dimen/layout_horizontal_margin"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeOff">
+
+                <TextView
+                    android:id="@+id/promptSimplifiedModeOnTitle"
+                    style="@style/Widget.Vector.TextView.Body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="start"
+                    android:text="@string/prompt_simplified_mode_on"
+                    android:textColor="?vctr_content_primary"
+                    android:textSize="16sp"
+                    app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOnText"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed" />
+
+                <TextView
+                    android:id="@+id/promptSimplifiedModeOnText"
+                    style="@style/Widget.Vector.TextView.Caption"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:gravity="start"
+                    android:text="@string/prompt_simplified_mode_on_text"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/promptSimplifiedModeOnTitle" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>