1 files changed, 8 insertions, 6 deletions
diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml
index 8c8dba11dd..399973eef0 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/src/main/res/layout/problem_report.xml
@@ -38,7 +38,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_weight="0"
-                          android:layout_marginTop="4dp"
+                          android:layout_marginTop="2dp"
                           android:layout_marginBottom="8dp"
                           android:layout_marginHorizontal="@dimen/side_margin"
                           android:text="@string/report_a_problem"
@@ -70,21 +70,23 @@
                                   android:layout_width="match_parent"
                                   android:layout_height="0dp"
                                   android:layout_weight="1"
-                                  android:layout_marginHorizontal="22dp"
+                                  android:layout_marginHorizontal="@dimen/side_margin"
                                   android:singleLine="false"
                                   android:hint="@string/user_message_hint"
                                   android:gravity="top"
                                   style="@style/InputText" />
                         <Button android:id="@+id/send_button"
                                 android:layout_marginHorizontal="@dimen/side_margin"
-                                android:layout_marginVertical="16dp"
+                                android:layout_marginTop="@dimen/button_separation"
+                                android:layout_marginBottom="@dimen/screen_vertical_margin"
                                 android:enabled="false"
                                 android:text="@string/send"
                                 style="@style/GreenButton" />
                     </LinearLayout>
                     <LinearLayout android:layout_width="match_parent"
                                   android:layout_height="match_parent"
-                                  android:layout_marginVertical="16dp"
+                                  android:layout_marginTop="16dp"
+                                  android:layout_marginBottom="@dimen/screen_vertical_margin"
                                   android:layout_marginHorizontal="@dimen/side_margin"
                                   android:orientation="vertical">
                         <FrameLayout android:layout_width="60dp"
@@ -146,12 +148,12 @@
                                android:layout_height="0dp"
                                android:layout_weight="1" />
                         <Button android:id="@+id/edit_message_button"
-                                android:layout_marginTop="16dp"
+                                android:layout_marginTop="@dimen/button_separation"
                                 android:text="@string/edit_message"
                                 android:visibility="gone"
                                 style="@style/BlueButton" />
                         <Button android:id="@+id/try_again_button"
-                                android:layout_marginTop="16dp"
+                                android:layout_marginTop="@dimen/button_separation"
                                 android:text="@string/try_again"
                                 android:visibility="gone"
                                 style="@style/GreenButton" />