diff --git a/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml b/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml
deleted file mode 100644
index 382a5776390..00000000000
--- a/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="16dp">
-
-        <TextView
-            android:id="@+id/system_information_application_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/application_information"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <TextView
-            android:id="@+id/system_information_application_identifier_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:text="@string/application_identifier"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:id="@+id/system_information_application_identifier"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/empty" />
-
-        <TextView
-            android:id="@+id/system_information_application_version_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:text="@string/application_version"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:id="@+id/system_information_application_version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/empty" />
-
-        <TextView
-            android:id="@+id/system_information_application_compile_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:text="@string/application_compile_information"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <TextView
-            android:id="@+id/system_information_application_compile"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/empty"/>
-
-        <TextView
-            android:id="@+id/system_information_application_install_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:text="@string/application_install_date"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:id="@+id/system_information_application_install"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/empty" />
-
-        <TextView
-            android:id="@+id/system_information_persistence_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:text="@string/persistence_information"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-
-        <TextView
-            android:id="@+id/system_information_persistence_status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:text="@string/empty" />
-
-        <TextView
-            android:id="@+id/system_information_persistence_waiting_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp"
-            android:text="@string/persistence_waiting_events"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <ListView
-            android:id="@+id/system_information_persistence_waiting"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fadeScrollbars="false" />
-
-        <Button
-            android:id="@+id/system_information_persistence_clear"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/persistence_waiting_clear_events"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_normal.xml
new file mode 100644
index 00000000000..38555d2b60c
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_normal.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/sap_gray_black_30">
+
+        <include
+            android:id="@+id/toolbar_layout"
+            layout="@layout/toolbar"/>
+
+        <Button
+            android:id="@+id/system_information_persistence_clear"
+            style="?attr/buttonSolidSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_margin="16dp"
+            android:text="@string/persistence_waiting_clear_events"/>
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/system_information_persistence_clear"
+            android:layout_below="@id/toolbar_layout"
+            android:fillViewport="true">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:id="@+id/system_information_application_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/application_information"
+                    android:textAppearance="?attr/textNormal"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_identifier_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:text="@string/application_identifier"
+                    android:textAppearance="?attr/textSmall"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_identifier"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?attr/textXSmall"
+                    tools:text="N10"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_version_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:text="@string/application_version"
+                    android:textAppearance="?attr/textSmall"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_version"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?attr/textXSmall"
+                    tools:text="7 - Laser.debug (Code 7)"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_compile_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:text="@string/application_compile_information"
+                    android:textAppearance="?attr/textSmall"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_compile"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?attr/textXSmall"
+                    tools:text="branch (UTC-Time)"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_install_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:text="@string/application_install_date"
+                    android:textAppearance="?attr/textSmall"/>
+
+                <TextView
+                    android:id="@+id/system_information_application_install"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?attr/textXSmall"
+                    tools:text="01. January 2015 - 00:00"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <Button
+                        android:id="@+id/eula_button"
+                        style="?buttonSolidSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="16dp"
+                        android:layout_marginRight="16dp"
+                        android:text="@string/eula"/>
+
+                    <Button
+                        android:id="@+id/licence_button"
+                        style="?buttonSolidSmall"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="16dp"
+                        android:text="@string/licence_information"/>
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/system_information_persistence_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:text="@string/persistence_information"
+                    android:textAppearance="?attr/textNormal"/>
+
+                <TextView
+                    android:id="@+id/system_information_persistence_status"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:textAppearance="?attr/textXSmall"
+                    tools:text="No open\nLast send: never"/>
+
+                <TextView
+                    android:id="@+id/system_information_persistence_waiting_header"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:text="@string/persistence_waiting_events"
+                    android:textAppearance="?attr/textSmall"/>
+
+                <ListView
+                    android:id="@+id/system_information_persistence_waiting"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:fadeScrollbars="false"/>
+            </LinearLayout>
+        </ScrollView>
+
+
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_xlarge.xml
similarity index 99%
rename from mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view.xml
rename to mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_xlarge.xml
index 9109015338d..f3fa77d05f0 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_xlarge.xml
@@ -92,6 +92,13 @@
                 android:text="@string/application_install_date"
                 android:textAppearance="?attr/textSmall"/>
 
+            <TextView
+                android:id="@+id/system_information_application_install"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?attr/textXSmall"
+                tools:text="01. January 2015 - 00:00"/>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -117,12 +124,6 @@
                     android:text="@string/licence_information"/>
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/system_information_application_install"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?attr/textXSmall"
-                tools:text="01. January 2015 - 00:00"/>
 
             <TextView
                 android:id="@+id/system_information_persistence_header"
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-land/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-land/references.xml
index badd4782024..ef2a3e5a45c 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-land/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-land/references.xml
@@ -9,5 +9,6 @@
     <item name="race_main" type="layout">@layout/race_main_xlarge</item>
     <item name="race_panel_flags" type="layout">@layout/race_panel_flags_ver</item>
     <item name="race_panel_setup" type="layout">@layout/race_panel_setup_ver</item>
+    <item name="system_information_view" type="layout">@layout/system_information_view_xlarge</item>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
index 9c65b3fce50..1ba516f71dd 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
@@ -30,5 +30,6 @@
     <item name="race_time_picker" type="layout">@layout/race_time_picker_normal</item>
     <item name="toolbar" type="layout">@layout/toolbar_normal</item>
     <item name="wind_view" type="layout">@layout/wind_view_normal</item>
+    <item name="system_information_view" type="layout">@layout/system_information_view_normal</item>
 
 </resources>
\ No newline at end of file