diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 636c26e156..0d2cdfc140 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -184,7 +184,7 @@
             android:text="@string/title_advanced_download"
             android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintEnd_toStartOf="@+id/spDownload"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMeteredHint" />
 
@@ -193,20 +193,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="6dp"
             android:entries="@array/downloadNames"
-            android:gravity="end"
-            app:layout_constraintBottom_toBottomOf="@id/tvDownload"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvDownload"
-            app:layout_constraintTop_toTopOf="@id/tvDownload" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/barrier1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="tvDownload,spDownload" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvDownload" />
 
         <TextView
             android:id="@+id/tvSectionDisplay"
@@ -217,7 +207,7 @@
             android:text="@string/title_advanced_section_display"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/barrier1" />
+            app:layout_constraintTop_toBottomOf="@id/spDownload" />
 
         <View
             android:id="@+id/vSeparatorDisplay"