diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_login.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_login.xml
index 1ecbbb00afb..8736ae33d60 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_login.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_login.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:showIn="@layout/login_backdrop_normal">
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       xmlns:tools="http://schemas.android.com/tools"
+       android:layout_width="match_parent"
+       android:layout_height="match_parent"
+       android:orientation="vertical"
+       tools:showIn="@layout/login_backdrop_normal">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -19,7 +19,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginLeft="@dimen/side_padding"
-            android:src="@drawable/ic_create_light" />
+            android:src="@drawable/ic_create_light"/>
 
         <TextView
             android:id="@+id/server_url_label"
@@ -27,8 +27,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@id/change_server"
+            android:paddingLeft="@dimen/float_label_padding"
             android:text="@string/server_url"
-            android:textColor="@color/constant_black" />
+            android:textAppearance="?attr/floatLabel"/>
 
         <TextView
             android:id="@+id/server_url"
@@ -37,14 +38,15 @@
             android:layout_alignParentLeft="true"
             android:layout_below="@id/server_url_label"
             android:layout_toLeftOf="@id/change_server"
+            android:paddingLeft="@dimen/float_label_padding"
+            android:textAppearance="?attr/textSmall"
             android:textColor="@color/constant_black"
-            tools:text="https://dev.sapsailing.com" />
+            tools:text="https://dev.sapsailing.com"/>
     </RelativeLayout>
 
     <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/side_padding"
         app:floatLabelPaddingLeft="@dimen/float_label_padding"
         app:floatLabelTextAppearance="?attr/floatLabel">
 
@@ -54,14 +56,14 @@
             android:layout_height="wrap_content"
             android:hint="@string/username"
             android:inputType="text"
+            android:textAppearance="?attr/textSmall"
             android:textColor="@color/constant_black"
-            android:textColorHint="@color/dialog_color_text" />
+            android:textColorHint="@color/dialog_color_text"/>
     </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
 
     <com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/side_padding"
         app:floatLabelPaddingLeft="@dimen/float_label_padding"
         app:floatLabelTextAppearance="?attr/floatLabel">
 
@@ -71,8 +73,9 @@
             android:layout_height="wrap_content"
             android:hint="@string/password"
             android:inputType="textPassword"
+            android:textAppearance="?attr/textSmall"
             android:textColor="@color/constant_black"
-            android:textColorHint="@color/dialog_color_text" />
+            android:textColorHint="@color/dialog_color_text"/>
     </com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
 
     <Button
@@ -82,6 +85,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/side_padding"
         android:text="@string/login"
-        android:textSize="@dimen/textSize_18" />
+        android:textSize="@dimen/textSize_18"/>
 
 </merge>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
index 80a38c20a6d..1037ae467fa 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="thick_line">2dp</dimen>
     <dimen name="obesity_line">3dp</dimen>
 
-    <dimen name="float_label_padding">9dp</dimen>
+    <dimen name="float_label_padding">3dp</dimen>
 
     <dimen name="textSize_14">12sp</dimen> <!-- XXSmall -->
     <dimen name="textSize_18">14sp</dimen> <!-- XSmall -->