diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 5e2a84ca88..78d853f3f3 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -1,95 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="24dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <TextView
+        android:id="@+id/tvCaption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_setup_theme"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:id="@+id/scroll"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvCaption">
 
-        <RadioGroup
-            android:id="@+id/rgTheme"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-            <RadioButton
-                android:id="@+id/rbThemeLight"
-                android:layout_width="wrap_content"
+            <RadioGroup
+                android:id="@+id/rgTheme"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="6dp"
-                android:text="@string/title_setup_light_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-            <RadioButton
-                android:id="@+id/rbThemeDark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:padding="6dp"
-                android:text="@string/title_setup_dark_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                <RadioButton
+                    android:id="@+id/rbThemeLight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_light_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <RadioButton
-                android:id="@+id/rbThemeBlack"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:padding="6dp"
-                android:text="@string/title_setup_black_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                <RadioButton
+                    android:id="@+id/rbThemeDark"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_dark_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <RadioButton
-                android:id="@+id/rbThemeGreyLight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:padding="6dp"
-                android:text="@string/title_setup_grey_light_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                <RadioButton
+                    android:id="@+id/rbThemeBlack"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_black_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <RadioButton
-                android:id="@+id/rbThemeGreyDark"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:padding="6dp"
-                android:text="@string/title_setup_grey_dark_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                <RadioButton
+                    android:id="@+id/rbThemeGreyLight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_grey_light_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <RadioButton
-                android:id="@+id/rbThemeSystem"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:padding="6dp"
-                android:text="@string/title_setup_system_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+                <RadioButton
+                    android:id="@+id/rbThemeGreyDark"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_grey_dark_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <RadioButton
-                android:id="@+id/rbThemeGreySystem"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:padding="6dp"
-                android:text="@string/title_setup_grey_system_theme"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-        </RadioGroup>
+                <RadioButton
+                    android:id="@+id/rbThemeSystem"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_system_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-        <TextView
-            android:id="@+id/tvSystem"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:text="@string/title_setup_system_theme_hint"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rgTheme" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+                <RadioButton
+                    android:id="@+id/rbThemeGreySystem"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:padding="6dp"
+                    android:text="@string/title_setup_grey_system_theme"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+            </RadioGroup>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <TextView
+        android:id="@+id/tvSystem"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:text="@string/title_setup_system_theme_hint"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="italic"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/scroll" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file