diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index b6e1f23c1..150073bce 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -10,7 +10,8 @@
         android:layout_height="match_parent" />
     <RelativeLayout
         android:orientation="vertical" android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
         <com.viewpagerindicator.IconPageIndicator
             android:id="@+id/view_pager_indicator"
             android:layout_height="wrap_content"
@@ -27,7 +28,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="6dp"
             android:layout_alignParentTop="true"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="@dimen/spacing_small"
             android:textColor="@android:color/white"
             android:background="@color/transparent" />
 
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index e7f0eb1cb..539971703 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -253,13 +253,15 @@
 
         </LinearLayout>
 
-        <Button
+        <ImageButton
             android:id="@+id/back_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_arrow_back_white_36dp"
+            android:src="@drawable/ic_arrow_back_white_36dp"
             android:background="@color/transparent"
             android:paddingStart="12dp"
+            android:paddingEnd="0dp"
+            android:layout_marginTop="@dimen/spacing_small"
             android:alpha="0" />
     </FrameLayout>