diff --git a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
index a69a2ec27ec..b53e0348d5a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.sap.sailing.racecommittee.app"
-          xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.sap.sailing.racecommittee.app"
           android:versionCode="13"
           android:versionName="1.5">
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="22"/>
+        android:targetSdkVersion="22" />
 
     <permission
         android:name="com.sap.sailing.racecommittee.app.MAPS_RECEIVE"
-        android:protectionLevel="signature"/>
+        android:protectionLevel="signature" />
 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!--<uses-permission android:name="android.permission.CAMERA"/>-->
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
     <!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
-    <uses-permission android:name="com.sap.sailing.racecommittee.app.MAPS_RECEIVE"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+    <!--<uses-permission android:name="com.sap.sailing.racecommittee.app.MAPS_RECEIVE" />-->
 
     <uses-feature
         android:glEsVersion="0x00020000"
-        android:required="true"/>
+        android:required="true" />
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false"/>
+        android:required="false" />
 
     <application
         android:name=".RaceApplication"
@@ -39,17 +39,16 @@
         android:theme="@style/AppTheme.Light">
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version"/>
+            android:value="@integer/google_play_services_version" />
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
-            android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY"/>
+            android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY" />
 
-        <activity
-            android:name=".ui.activities.LoginActivity">
+        <activity android:name=".ui.activities.LoginActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -68,41 +67,43 @@
                     android:pathPattern="apps/com.sap.sailing.racecommittee.app.apk"/>
             </intent-filter>
         </activity>
-        <activity android:name=".ui.activities.RacingActivity"/>
-        <activity android:name=".ui.activities.PasswordActivity"/>
-        <activity android:name=".ui.activities.PreferenceActivity">
+        <activity android:name=".ui.activities.RacingActivity" />
+        <activity android:name=".ui.activities.PasswordActivity" />
+        <activity
+            android:name=".ui.activities.PreferenceActivity"
+            android:theme="@style/PreferenceTheme">
             <intent-filter>
-                <action android:name="android.intent.action.MANAGE_NETWORK_USAGE"/>
+                <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.activities.SystemInformationActivity"/>
+        <activity android:name=".ui.activities.SystemInformationActivity" />
 
         <service
             android:name=".services.RaceStateService"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.sap.sailing.racecommittee.app.action.startProcedureSpecificAction"/>
+                <action android:name="com.sap.sailing.racecommittee.app.action.startProcedureSpecificAction" />
             </intent-filter>
         </service>
         <service
             android:name="com.sap.sailing.android.shared.services.sending.MessageSendingService"
             android:exported="false">
             <intent-filter>
-                <action android:name="com.sap.sailing.racecommittee.app.action.sendSavedIntents"/>
-                <action android:name="com.sap.sailing.racecommittee.app.action.sendMessage"/>
+                <action android:name="com.sap.sailing.racecommittee.app.action.sendSavedIntents" />
+                <action android:name="com.sap.sailing.racecommittee.app.action.sendMessage" />
             </intent-filter>
 
             <meta-data
                 android:name="com.sap.sailing.android.shared.services.sending.messageRestorer"
-                android:value="com.sap.sailing.racecommittee.app.services.sending.EventRestorer"/>
+                android:value="com.sap.sailing.racecommittee.app.services.sending.EventRestorer" />
         </service>
 
         <receiver android:name="com.sap.sailing.android.shared.services.sending.ConnectivityChangedReceiver">
             <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
         </receiver>
     </application>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_autorenew_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_autorenew_yellow_24dp.png
new file mode 100644
index 00000000000..1de10776731
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_autorenew_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_boat_white_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_boat_white_24dp.png
new file mode 100644
index 00000000000..e28d64e4fd4
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_boat_white_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_boat_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_boat_yellow_24dp.png
new file mode 100644
index 00000000000..45f70887e41
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_boat_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_directions_boat.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_directions_boat.png
deleted file mode 100644
index bbc895c25af..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_directions_boat.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_more_horiz_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_more_horiz_yellow_24dp.png
new file mode 100644
index 00000000000..4621f30b4fa
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_more_horiz_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_pin_drop_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_pin_drop_yellow_24dp.png
new file mode 100644
index 00000000000..c8698d2dbbe
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_pin_drop_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_autorenew_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_autorenew_yellow_24dp.png
new file mode 100644
index 00000000000..e5454cb990b
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_autorenew_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_boat_white_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_boat_white_24dp.png
new file mode 100644
index 00000000000..004e60e53dd
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_boat_white_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_boat_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_boat_yellow_24dp.png
new file mode 100644
index 00000000000..00c2756213c
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_boat_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_directions_boat.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_directions_boat.png
deleted file mode 100644
index 5a79c4157cb..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_directions_boat.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_more_horiz_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_more_horiz_yellow_24dp.png
new file mode 100644
index 00000000000..8b9453d5d29
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_more_horiz_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_pin_drop_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_pin_drop_yellow_24dp.png
new file mode 100644
index 00000000000..6b7cc5116a8
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_pin_drop_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-v21/preference_background.xml b/mobile/com.sap.sailing.racecommittee.app/res/drawable-v21/preference_background.xml
new file mode 100644
index 00000000000..05e92ca30f4
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/drawable-v21/preference_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/constant_light_gray_ripple">
+
+    <item android:drawable="@color/light_sap_gray_black_30"/>
+
+</ripple>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_autorenew_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_autorenew_yellow_24dp.png
new file mode 100644
index 00000000000..1a796b17dc5
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_autorenew_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_boat_white_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_boat_white_24dp.png
new file mode 100644
index 00000000000..5c4b2f565d3
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_boat_white_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_boat_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_boat_yellow_24dp.png
new file mode 100644
index 00000000000..07e39e62e1a
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_boat_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_directions_boat.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_directions_boat.png
deleted file mode 100644
index 8eab07db747..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_directions_boat.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_more_horiz_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_more_horiz_yellow_24dp.png
new file mode 100644
index 00000000000..983536e6292
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_more_horiz_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_pin_drop_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_pin_drop_yellow_24dp.png
new file mode 100644
index 00000000000..fc81339f0c7
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_pin_drop_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_autorenew_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_autorenew_yellow_24dp.png
new file mode 100644
index 00000000000..3f6b7842d30
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_autorenew_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_boat_white_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_boat_white_24dp.png
new file mode 100644
index 00000000000..4f6e50b3ebc
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_boat_white_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_boat_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_boat_yellow_24dp.png
new file mode 100644
index 00000000000..ee1762928d9
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_boat_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_directions_boat.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_directions_boat.png
deleted file mode 100644
index dd3d0de631f..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_directions_boat.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_more_horiz_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_more_horiz_yellow_24dp.png
new file mode 100644
index 00000000000..4f8e47f62f0
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_more_horiz_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_pin_drop_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_pin_drop_yellow_24dp.png
new file mode 100644
index 00000000000..bc7003e65b1
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_pin_drop_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_autorenew_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_autorenew_yellow_24dp.png
new file mode 100644
index 00000000000..e49ed5eb44b
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_autorenew_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_boat_white_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_boat_white_24dp.png
new file mode 100644
index 00000000000..49efaefa35d
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_boat_white_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_boat_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_boat_yellow_24dp.png
new file mode 100644
index 00000000000..dd10facd48b
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_boat_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_directions_boat.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_directions_boat.png
deleted file mode 100644
index bdf2434ad4f..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_directions_boat.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_more_horiz_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_more_horiz_yellow_24dp.png
new file mode 100644
index 00000000000..4a5e428d0c2
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_more_horiz_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_pin_drop_yellow_24dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_pin_drop_yellow_24dp.png
new file mode 100644
index 00000000000..8ec1eafbc57
Binary files /dev/null and b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_pin_drop_yellow_24dp.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable/preference_background.xml b/mobile/com.sap.sailing.racecommittee.app/res/drawable/preference_background.xml
new file mode 100644
index 00000000000..924aba664e5
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/drawable/preference_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- pressed -->
+    <item android:drawable="@color/constant_light_gray_pressed" android:state_pressed="true" />
+
+    <!-- default -->
+    <item android:drawable="@color/light_sap_gray_black_30" />
+
+</selector>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/pref_header.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/pref_header.xml
new file mode 100644
index 00000000000..181a2803ce8
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/pref_header.xml
@@ -0,0 +1,28 @@
+<?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="@dimen/preference_item_height"
+    android:orientation="vertical"
+    android:background="@drawable/preference_background">
+
+    <TextView
+        android:id="@+id/preference_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="16dp"
+        android:drawablePadding="32dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingRight="8dp"
+        tools:text="@string/settings_category_general" />
+
+    <View
+        android:id="@+id/preference_line"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/thin_line"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="@dimen/preference_line_margin"
+        android:background="@color/light_sap_gray" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_header.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_header.xml
index fbbbe4c8604..985cceadd06 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_header.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_header.xml
@@ -1,37 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="#e1e1e0"
+    android:orientation="vertical">
 
-    <Button
-        android:id="@+id/buttonGeneral"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/preference_header"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:tag="com.sap.sailing.racecommittee.app.ui.fragments.preference.GeneralPreferenceFragment"
-        android:text="@string/settings_category_general" />
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/preference_side_margin"
+        android:layout_marginRight="@dimen/preference_side_margin" />
 
-    <Button
-        android:id="@+id/buttonRegattaDefault"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/buttonGeneral"
-        android:tag="com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaPreferenceFragment"
-        android:text="@string/settings_category_regatta_defaults" />
-
-    <Button
-        android:id="@+id/buttonRegatta"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/buttonRegattaDefault"
-        android:tag="com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaSpecificPreferenceFragment"
-        android:text="@string/settings_category_regattas" />
-
-    <Button
-        android:id="@+id/buttonCourseDesigner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/buttonRegatta"
-        android:tag="com.sap.sailing.racecommittee.app.ui.fragments.preference.CourseDesignerPreferenceFragment"
-        android:text="@string/settings_category_course_designer" />
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_view.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_view.xml
index 2d993a4abc9..c1df91d97ae 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_view.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/preference_view.xml
@@ -4,18 +4,16 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    android:background="?attr/sap_gray_black_30">
+    android:background="@color/light_sap_gray_black_30">
 
     <include
         android:id="@+id/toolbar_layout"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_pref" />
 
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/toolbar_layout"
-        android:layout_marginLeft="@dimen/preference_margin"
-        android:layout_marginRight="@dimen/preference_margin" />
+        android:layout_below="@id/toolbar_layout" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_normal.xml
new file mode 100644
index 00000000000..ce2311c7867
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_normal.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/toolbar_layout"
+    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="wrap_content"
+    android:background="?attr/colorPrimary">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        app:theme="@style/ToolBarStyle"
+        app:popupTheme="@style/Theme.AppCompat.Light">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                tools:text="AUSWAHL"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="center"
+            android:minHeight="?attr/actionBarSize"
+            android:orientation="horizontal">
+
+            <ProgressBar
+                android:id="@+id/progress_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:indeterminate="true"
+                android:visibility="gone"/>
+        </LinearLayout>
+    </android.support.v7.widget.Toolbar>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/thick_line"
+        android:layout_below="@id/toolbar"
+        android:background="@color/sap_yellow"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_xlarge.xml
new file mode 100644
index 00000000000..e70815ad3bb
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_xlarge.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/toolbar_layout"
+    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="wrap_content"
+    android:background="?attr/colorPrimary">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        app:theme="@style/ToolBarRacingStyle"
+        app:popupTheme="@style/Theme.AppCompat.Light"
+        app:titleTextAppearance="@style/RacingToolBarTitle">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                tools:text="AUSWAHL"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="center"
+            android:minHeight="?attr/actionBarSize"
+            android:orientation="horizontal">
+
+            <ProgressBar
+                android:id="@+id/progress_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:indeterminate="true"
+                android:visibility="gone"/>
+        </LinearLayout>
+    </android.support.v7.widget.Toolbar>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/thick_line"
+        android:layout_below="@id/toolbar"
+        android:background="@color/sap_yellow"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
index 18134bc18ab..53d90b8bf10 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
@@ -500,6 +500,7 @@
 
     <string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
     <string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
+    <string name="reload_config">Konfiguration vom Server laden</string>
 
     <string name="abort_title">Rennen abbrechen</string>
     <string name="abort_hint">Welche laufenden Rennen möchten Sie abbrechen?</string>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp-land/dimens.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp-land/dimens.xml
index 5099bf579ef..f776e9ae137 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp-land/dimens.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp-land/dimens.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <item name="preference_columns" format="integer" type="integer">2</item>
+
     <dimen name="navigation_drawer_width">500dp</dimen>
 
     <dimen name="side_button_lockSize">16dp</dimen>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/dimens.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/dimens.xml
index 9e2f70222f7..d1ee41ddfc6 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/dimens.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/dimens.xml
@@ -17,6 +17,10 @@
     <dimen name="switch_height">40dp</dimen>
     <dimen name="switch_padding">16dp</dimen>
 
+    <dimen name="preference_margin">16dp</dimen>
+    <dimen name="preference_line_margin">0dp</dimen>
+    <item name="preference_columns" format="integer" type="integer">1</item>
+
     <!-- race state dependent -->
     <!-- login -->
     <dimen name="login_text_size_small">@dimen/textSize_22</dimen>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/dimens.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/dimens.xml
index 1739260109d..e65c87681bc 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/dimens.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/dimens.xml
@@ -15,8 +15,6 @@
 
 	<dimen name="header_line">@dimen/thick_line</dimen>
 
-	<dimen name="preference_margin">0dp</dimen>
-
 	<dimen name="panel_text_padding">5dp</dimen>
 
 	<dimen name="textSize_14">14sp</dimen> <!-- XXSmall -->
@@ -48,6 +46,9 @@
 
 	<dimen name="flags">96dp</dimen>
 
+	<dimen name="preference_side_margin">72dp</dimen>
+	<item name="preference_columns" format="integer" type="integer">2</item>
+
 	<!-- custom dimens (float, integer) -->
 	<item name="picker_scale" format="float" type="integer">1.55</item>
 	<item name="flag_size" format="integer" type="integer">48</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
index c63fad1e780..ef0ce0eb21a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
@@ -17,5 +17,6 @@
     <item name="race_schedule_procedure_pathfinder" type="layout">@layout/race_schedule_procedure_pathfinder_xlarge</item>
     <item name="race_schedule_procedure_timing" type="layout">@layout/race_schedule_procedure_timing_xlarge</item>
     <item name="toolbar" type="layout">@layout/toolbar_xlarge</item>
+    <item name="toolbar_pref" type="layout">@layout/toolbar_pref_xlarge</item>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-v19/styles.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-v19/styles.xml
new file mode 100644
index 00000000000..24b5b41f56c
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-v19/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="PreferenceTheme" parent="PreferenceBase">
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-v21/styles.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-v21/styles.xml
new file mode 100644
index 00000000000..9e901c7b9c2
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-v21/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="PreferenceTheme" parent="PreferenceBase">
+        <item name="android:colorPrimary">@color/light_colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/light_colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/light_colorAccent</item>
+
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+
+</resources>
\ 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 ec02c83ad38..bdb09c69cab 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/dimens.xml
@@ -16,8 +16,6 @@
 
     <dimen name="header_line">@dimen/thin_line</dimen>
 
-    <dimen name="preference_margin">0dp</dimen>
-
     <dimen name="panel_text_padding">5dp</dimen>
 
     <dimen name="thin_line">1dp</dimen>
@@ -104,6 +102,12 @@
     <dimen name="switch_height">32dp</dimen>
     <dimen name="switch_padding">8dp</dimen>
 
+    <dimen name="preference_side_margin">0dp</dimen>
+    <dimen name="preference_margin">0dp</dimen>
+    <dimen name="preference_line_margin">72dp</dimen>
+    <dimen name="preference_item_height">72dp</dimen>
+    <item name="preference_columns" format="integer" type="integer">1</item>
+
     <!-- race state dependent -->
     <!-- login -->
     <dimen name="login_text_size_small">@dimen/textSize_18</dimen>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
index d6b8907eb05..97c31927d6c 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
@@ -121,4 +121,8 @@
 
     <string name="preference_non_public_events_key" translatable="false">show_non_public_events</string>
     <bool name="preference_non_public_events_default">false</bool>
+
+    <string name="preference_config_needs_refresh_key" translatable="false">config_refresh</string>
+    <bool name="preference_config_needs_refresh_default" translatable="false">true</bool>
+
 </resources>
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 36ce2c7c331..14bd788fd06 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
@@ -29,6 +29,7 @@
     <item name="race_schedule_start_time" type="layout">@layout/race_schedule_start_time_normal</item>
     <item name="race_time_picker" type="layout">@layout/race_time_picker_normal</item>
     <item name="toolbar" type="layout">@layout/toolbar_normal</item>
+    <item name="toolbar_pref" type="layout">@layout/toolbar_pref_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>
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
index eb8f837bf65..65eaf5d2b3f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
@@ -528,6 +528,7 @@
 
     <string name="preference_non_public_events_header">Show Non Public Events</string>
     <string name="preference_non_public_events_summary">Load all events including the no public one.</string>
+    <string name="reload_config">Reload Configuration from Server</string>
 
     <string name="abort_title">Abort Races</string>
     <string name="abort_hint">Which running races do you want to abort?</string>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/styles.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/styles.xml
index f64ef864027..f4c0bcecdf0 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/styles.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/styles.xml
@@ -22,6 +22,14 @@
         <item name="android:textColor">@color/dialog_color_header</item>
     </style>
 
+    <style name="PreferenceTheme" parent="PreferenceBase"/>
+
+    <style name="PreferenceBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/light_colorPrimary</item>
+        <item name="colorPrimaryDark">@color/light_colorPrimaryDark</item>
+        <item name="colorAccent">@color/light_colorAccent</item>
+    </style>
+
     <style name="ToolBarStyle" parent="@style/ThemeOverlay.AppCompat.Dark">
         <item name="android:textColorSecondary">@color/constant_white</item>
     </style>
@@ -34,9 +42,9 @@
 
     <style name="DrawerButton" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="thickness">4dp</item>
-<!--
+        <!--
         <item name="barSize">30dp</item>
--->
+        -->
         <item name="gapBetweenBars">6dp</item>
         <item name="drawableSize">32dp</item>
         <item name="spinBars">false</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
index 3c58f78be93..19d3192a3f8 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
@@ -61,6 +61,7 @@ public class AppPreferences {
     public static AppPreferences on(Context context, String preferenceName) {
         return new AppPreferences(context, preferenceName);
     }
+
     protected final Context context;
 
     private OnSharedPreferenceChangeListener pollingActiveChangedListener = new OnSharedPreferenceChangeListener() {
@@ -76,18 +77,20 @@ public class AppPreferences {
     private Set<PollingActiveChangedListener> pollingActiveChangedListeners = new HashSet<>();
 
     protected final SharedPreferences preferences;
+
     protected AppPreferences(Context context) {
         this.context = context.getApplicationContext();
         this.preferences = PreferenceManager.getDefaultSharedPreferences(context);
     }
+
     public AppPreferences(Context context, String preferenceName) {
         this.context = context.getApplicationContext();
         this.preferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
     }
 
     public void setAuthor(AbstractLogEventAuthor author) {
-        preferences.edit().putString(HIDDEN_PREFERENCE_AUTHOR_NAME, author.getName()).commit();
-        preferences.edit().putInt(HIDDEN_PREFERENCE_AUTHOR_PRIORITY, author.getPriority()).commit();
+        preferences.edit().putString(HIDDEN_PREFERENCE_AUTHOR_NAME, author.getName()).putInt(HIDDEN_PREFERENCE_AUTHOR_PRIORITY, author.getPriority())
+            .commit();
     }
 
     public AbstractLogEventAuthor getAuthor() {
@@ -134,8 +137,7 @@ public class AppPreferences {
     }
 
     public RacingProcedureType getDefaultRacingProcedureType() {
-        String defaultStartProcedureType = preferences.getString(
-                key(R.string.preference_racing_procedure_override_key), "");
+        String defaultStartProcedureType = preferences.getString(key(R.string.preference_racing_procedure_override_key), "");
         return RacingProcedureType.valueOf(defaultStartProcedureType);
     }
 
@@ -156,24 +158,24 @@ public class AppPreferences {
         return preferences.getBoolean(key(R.string.preference_racing_procedure_gatestart_haspathfinder_key), true);
     }
 
-	public LoginType getLoginType() {
-		int type = preferences.getInt(HIDDEN_PREFERENCE_LOGIN_TYPE, -1);
-		switch( type ){
-			case 0:{
-				return LoginType.NONE;
-			}
-			case 1:{
-				return LoginType.VIEWER;
-			}
-			case 2:{
-				return LoginType.OFFICER;
-			}
+    public LoginType getLoginType() {
+        int type = preferences.getInt(HIDDEN_PREFERENCE_LOGIN_TYPE, -1);
+        switch (type) {
+            case 0: {
+                return LoginType.NONE;
+            }
+            case 1: {
+                return LoginType.VIEWER;
+            }
+            case 2: {
+                return LoginType.OFFICER;
+            }
 
-			default:{
-				return LoginType.NONE;
-			}
-		}
-	}
+            default: {
+                return LoginType.NONE;
+            }
+        }
+    }
 
     public String getMailRecipient() {
         return preferences.getString(key(R.string.preference_mail_key), "");
@@ -205,18 +207,18 @@ public class AppPreferences {
 
     private String getRacingProcedureClassFlagKey(RacingProcedureType type) {
         switch (type) {
-        case RRS26:
-            return key(R.string.preference_racing_procedure_rrs26_classflag_key);
-        case GateStart:
-            return key(R.string.preference_racing_procedure_gatestart_classflag_key);
-        case ESS:
-            return key(R.string.preference_racing_procedure_ess_classflag_key);
-        case BASIC:
-            return key(R.string.preference_racing_procedure_basic_classflag_key);
-        case LEAGUE:
-            return key(R.string.preference_racing_procedure_league_classflag_key);
-        default:
-            throw new IllegalArgumentException("Unknown racing procedure type.");
+            case RRS26:
+                return key(R.string.preference_racing_procedure_rrs26_classflag_key);
+            case GateStart:
+                return key(R.string.preference_racing_procedure_gatestart_classflag_key);
+            case ESS:
+                return key(R.string.preference_racing_procedure_ess_classflag_key);
+            case BASIC:
+                return key(R.string.preference_racing_procedure_basic_classflag_key);
+            case LEAGUE:
+                return key(R.string.preference_racing_procedure_league_classflag_key);
+            default:
+                throw new IllegalArgumentException("Unknown racing procedure type.");
         }
     }
 
@@ -227,18 +229,18 @@ public class AppPreferences {
 
     private String getRacingProcedureHasIndividualRecallKey(RacingProcedureType type) {
         switch (type) {
-        case RRS26:
-            return key(R.string.preference_racing_procedure_rrs26_hasxray_key);
-        case GateStart:
-            return key(R.string.preference_racing_procedure_gatestart_hasxray_key);
-        case ESS:
-            return key(R.string.preference_racing_procedure_ess_hasxray_key);
-        case BASIC:
-            return key(R.string.preference_racing_procedure_basic_hasxray_key);
-        case LEAGUE:
-            return key(R.string.preference_racing_procedure_league_hasxray_key);
-        default:
-            throw new IllegalArgumentException("Unknown racing procedure type.");
+            case RRS26:
+                return key(R.string.preference_racing_procedure_rrs26_hasxray_key);
+            case GateStart:
+                return key(R.string.preference_racing_procedure_gatestart_hasxray_key);
+            case ESS:
+                return key(R.string.preference_racing_procedure_ess_hasxray_key);
+            case BASIC:
+                return key(R.string.preference_racing_procedure_basic_hasxray_key);
+            case LEAGUE:
+                return key(R.string.preference_racing_procedure_league_hasxray_key);
+            default:
+                throw new IllegalArgumentException("Unknown racing procedure type.");
         }
     }
 
@@ -287,10 +289,10 @@ public class AppPreferences {
         return Double.longBitsToDouble(windSpeedAsLong);
     }
 
-    public LatLng getWindPosition(){
-    	double lat = Double.longBitsToDouble(preferences.getLong(HIDDEN_PREFERENCE_WIND_LAT, 0));
-    	double lng = Double.longBitsToDouble(preferences.getLong(HIDDEN_PREFERENCE_WIND_LNG, 0));
-    	return new LatLng(lat,lng);
+    public LatLng getWindPosition() {
+        double lat = Double.longBitsToDouble(preferences.getLong(HIDDEN_PREFERENCE_WIND_LAT, 0));
+        double lng = Double.longBitsToDouble(preferences.getLong(HIDDEN_PREFERENCE_WIND_LNG, 0));
+        return new LatLng(lat, lng);
     }
 
     public boolean isPollingActive() {
@@ -319,9 +321,7 @@ public class AppPreferences {
     }
 
     public void setByNameCourseDesignerCourseNames(List<String> courseNames) {
-        preferences
-                .edit()
-                .putStringSet(key(R.string.preference_course_designer_by_name_course_names_key), new HashSet<>(courseNames)).commit();
+        preferences.edit().putStringSet(key(R.string.preference_course_designer_by_name_course_names_key), new HashSet<>(courseNames)).commit();
     }
 
     public void setCourseLayout(CourseLayouts courseLayout) {
@@ -338,51 +338,47 @@ public class AppPreferences {
     }
 
     public void setGateStartHasAdditionalGolfDownTime(boolean hasAdditionalGolfDownTime) {
-        preferences
-                .edit()
-                .putBoolean(key(R.string.preference_racing_procedure_gatestart_hasadditionalgolfdowntime_key), hasAdditionalGolfDownTime).commit();
+        preferences.edit().putBoolean(key(R.string.preference_racing_procedure_gatestart_hasadditionalgolfdowntime_key), hasAdditionalGolfDownTime)
+            .commit();
     }
 
     public void setGateStartHasPathfinder(boolean hasPathfinder) {
-        preferences.edit()
-                .putBoolean(key(R.string.preference_racing_procedure_gatestart_haspathfinder_key), hasPathfinder)
-                .commit();
+        preferences.edit().putBoolean(key(R.string.preference_racing_procedure_gatestart_haspathfinder_key), hasPathfinder).commit();
     }
 
-	public void setLoginType(LoginType type) {
-        ExLog.i(getContext(), this.getClass().toString(), "setLoginType: "+ type);
+    public void setLoginType(LoginType type) {
+        ExLog.i(getContext(), this.getClass().toString(), "setLoginType: " + type);
 
         Editor setEdit = preferences.edit();
 
-		switch( type ){
-			case NONE:{
-				setEdit.putInt(HIDDEN_PREFERENCE_LOGIN_TYPE, 0);
-				break;
-			}
-			case VIEWER:{
-				setEdit.putInt(HIDDEN_PREFERENCE_LOGIN_TYPE, 1);
-				break;
-			}
-			case OFFICER:{
-				setEdit.putInt(HIDDEN_PREFERENCE_LOGIN_TYPE, 2);
-				break;
-			}
+        switch (type) {
+            case NONE: {
+                setEdit.putInt(HIDDEN_PREFERENCE_LOGIN_TYPE, 0);
+                break;
+            }
+            case VIEWER: {
+                setEdit.putInt(HIDDEN_PREFERENCE_LOGIN_TYPE, 1);
+                break;
+            }
+            case OFFICER: {
+                setEdit.putInt(HIDDEN_PREFERENCE_LOGIN_TYPE, 2);
+                break;
+            }
 
-			default:{
-				break;
-			}
-		}
+            default: {
+                break;
+            }
+        }
 
-		setEdit.commit();
-	}
+        setEdit.commit();
+    }
 
     public void setMailRecipient(String mail) {
         preferences.edit().putString(key(R.string.preference_mail_key), mail).commit();
     }
 
     public void setManagedCourseAreaNames(List<String> courseAreaNames) {
-        preferences.edit()
-                .putStringSet(key(R.string.preference_course_areas_key), new HashSet<>(courseAreaNames)).commit();
+        preferences.edit().putStringSet(key(R.string.preference_course_areas_key), new HashSet<>(courseAreaNames)).commit();
     }
 
     public void setNumberOfRounds(NumberOfRounds numberOfRounds) {
@@ -410,15 +406,12 @@ public class AppPreferences {
         for (Flags flag : flags) {
             flagNames.add(flag.name());
         }
-        preferences.edit().putStringSet(key(R.string.preference_racing_procedure_rrs26_startmode_flags_key), flagNames)
-                .commit();
+        preferences.edit().putStringSet(key(R.string.preference_racing_procedure_rrs26_startmode_flags_key), flagNames).commit();
     }
 
     public void setSendingActive(boolean activate) {
-        ExLog.i(getContext(), this.getClass().toString(), "setSendingActive: "+ activate);
-        preferences.edit()
-                .putBoolean(context.getResources().getString(R.string.preference_isSendingActive_key), activate)
-                .commit();
+        ExLog.i(getContext(), this.getClass().toString(), "setSendingActive: " + activate);
+        preferences.edit().putBoolean(context.getResources().getString(R.string.preference_isSendingActive_key), activate).commit();
     }
 
     public void setWindBearingFromDirection(double enteredWindBearing) {
@@ -434,10 +427,7 @@ public class AppPreferences {
     public void setWindPosition(LatLng latLng) {
         long lat = Double.doubleToLongBits(latLng.latitude);
         long lng = Double.doubleToLongBits(latLng.longitude);
-        preferences.edit()
-        	.putLong(HIDDEN_PREFERENCE_WIND_LAT, lat)
-        	.putLong(HIDDEN_PREFERENCE_WIND_LNG, lng)
-        .commit();
+        preferences.edit().putLong(HIDDEN_PREFERENCE_WIND_LAT, lat).putLong(HIDDEN_PREFERENCE_WIND_LNG, lng).commit();
     }
 
     public void unregisterPollingActiveChangedListener(PollingActiveChangedListener listener) {
@@ -448,33 +438,33 @@ public class AppPreferences {
     }
 
     public boolean isDemoAllowed() {
-        return preferences.getBoolean(context.getString(R.string.preference_allow_demo_key),
-            context.getResources().getBoolean(R.bool.preference_allow_demo_default));
+        return preferences.getBoolean(context.getString(R.string.preference_allow_demo_key), context.getResources()
+            .getBoolean(R.bool.preference_allow_demo_default));
     }
 
     public boolean wakelockEnabled() {
-        return preferences.getBoolean(context.getString(R.string.preference_wakelock_key), context.getResources()
-            .getBoolean(R.bool.preference_wakelock_default));
+        return preferences
+            .getBoolean(context.getString(R.string.preference_wakelock_key), context.getResources().getBoolean(R.bool.preference_wakelock_default));
     }
 
     public boolean isOfflineMode() {
-        return preferences.getBoolean(context.getString(R.string.preference_offline_key), context.getResources()
-            .getBoolean(R.bool.preference_offline_default));
+        return preferences
+            .getBoolean(context.getString(R.string.preference_offline_key), context.getResources().getBoolean(R.bool.preference_offline_default));
     }
 
     public boolean isDependentRacesAllowed() {
-        return preferences.getBoolean(context.getString(R.string.preference_allow_dependent_races_key),
-            context.getResources().getBoolean(R.bool.preference_allow_dependent_races_default));
+        return preferences.getBoolean(context.getString(R.string.preference_allow_dependent_races_key), context.getResources()
+            .getBoolean(R.bool.preference_allow_dependent_races_default));
     }
 
     public int getDependentRacesOffset() {
-        return preferences.getInt(context.getString(R.string.preference_dependent_races_offset_key),
-            context.getResources().getInteger(R.integer.preference_dependent_races_offset_default));
+        return preferences.getInt(context.getString(R.string.preference_dependent_races_offset_key), context.getResources()
+            .getInteger(R.integer.preference_dependent_races_offset_default));
     }
 
     public String getTheme() {
-        return preferences.getString(context.getString(R.string.preference_theme_key), context.getResources()
-            .getString(R.string.preference_theme_default));
+        return preferences
+            .getString(context.getString(R.string.preference_theme_key), context.getResources().getString(R.string.preference_theme_default));
     }
 
     public void setAccessToken(String accessToken) {
@@ -483,15 +473,24 @@ public class AppPreferences {
 
     public String getAccessToken() {
         return preferences.getString(context.getString(R.string.preference_access_token_key), null);
-	}
+    }
 
     public boolean isMagnetic() {
-        return preferences.getBoolean(context.getString(R.string.preference_heading_with_declination_subtracted_key),
-                context.getResources().getBoolean(R.bool.preference_heading_with_declination_subtracted_default));
+        return preferences.getBoolean(context.getString(R.string.preference_heading_with_declination_subtracted_key), context.getResources()
+            .getBoolean(R.bool.preference_heading_with_declination_subtracted_default));
     }
 
     public String showNonPublic() {
-        return preferences.getBoolean(context.getString(R.string.preference_non_public_events_key),
-            context.getResources().getBoolean(R.bool.preference_non_public_events_default)) ? "true" : "false";
+        return preferences.getBoolean(context.getString(R.string.preference_non_public_events_key), context.getResources()
+            .getBoolean(R.bool.preference_non_public_events_default)) ? "true" : "false";
+    }
+
+    public boolean needConfigRefresh() {
+        return preferences.getBoolean(context.getString(R.string.preference_config_needs_refresh_key), context.getResources()
+            .getBoolean(R.bool.preference_config_needs_refresh_default));
+    }
+
+    public void setNeedConfigRefresh(boolean refresh) {
+        preferences.edit().putBoolean(context.getString(R.string.preference_config_needs_refresh_key), refresh).commit();
     }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/configuration/impl/PreferencesDeviceConfigurationLoader.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/configuration/impl/PreferencesDeviceConfigurationLoader.java
index 447278e1639..12ffd07d231 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/configuration/impl/PreferencesDeviceConfigurationLoader.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/configuration/impl/PreferencesDeviceConfigurationLoader.java
@@ -17,20 +17,17 @@ public class PreferencesDeviceConfigurationLoader implements ConfigurationLoader
     private final DeviceConfigurationImpl configuration;
     private final AppPreferences preferences;
     private final ConfigurationLoader<RegattaConfiguration> regattaConfigurationLoader;
-    
+
     public static PreferencesDeviceConfigurationLoader wrap(DeviceConfiguration configuration, AppPreferences preferences) {
         RegattaConfiguration regattaConfiguration = configuration.getRegattaConfiguration();
         if (regattaConfiguration == null) {
             regattaConfiguration = new RegattaConfigurationImpl();
         }
-        return new PreferencesDeviceConfigurationLoader(
-                configuration, 
-                new PreferencesRegattaConfigurationLoader(regattaConfiguration, preferences), 
-                preferences);
+        return new PreferencesDeviceConfigurationLoader(configuration, new PreferencesRegattaConfigurationLoader(regattaConfiguration, preferences), preferences);
     }
-    
+
     private PreferencesDeviceConfigurationLoader(DeviceConfiguration configuration, PreferencesRegattaConfigurationLoader regattaLoader,
-            AppPreferences preferences) {
+        AppPreferences preferences) {
         if (!(configuration instanceof DeviceConfigurationImpl)) {
             throw new IllegalArgumentException("configuration");
         }
@@ -44,7 +41,7 @@ public class PreferencesDeviceConfigurationLoader implements ConfigurationLoader
         if (regattaConfigurationLoader != null) {
             configuration.setRegattaConfiguration(regattaConfigurationLoader.load());
         }
-        
+
         configuration.setAllowedCourseAreaNames(preferences.getManagedCourseAreaNames());
         configuration.setResultsMailRecipient(preferences.getMailRecipient());
         configuration.setByNameDesignerCourseNames(preferences.getByNameCourseDesignerCourseNames());
@@ -55,12 +52,12 @@ public class PreferencesDeviceConfigurationLoader implements ConfigurationLoader
     public void store() {
         Context context = preferences.getContext();
         ExLog.i(context, TAG, "Storing new device configuration.");
-        
+
         if (regattaConfigurationLoader != null) {
             regattaConfigurationLoader.store();
             logApply(context, "regatta configuration", "[object]");
         }
-        
+
         if (configuration.getAllowedCourseAreaNames() != null) {
             preferences.setManagedCourseAreaNames(configuration.getAllowedCourseAreaNames());
             logApply(context, "course areas", configuration.getAllowedCourseAreaNames());
@@ -73,10 +70,11 @@ public class PreferencesDeviceConfigurationLoader implements ConfigurationLoader
             preferences.setByNameCourseDesignerCourseNames(configuration.getByNameCourseDesignerCourseNames());
             logApply(context, "by name course designer course names", configuration.getByNameCourseDesignerCourseNames());
         }
-    }
-    
-    private static void logApply(Context context, String configurationName, Object value) {
-        ExLog.i(context, TAG, String.format("Applied '%s' configuration: %s.", configurationName, value==null?"null":value.toString()));
+
+        preferences.setNeedConfigRefresh(false);
     }
 
+    private static void logApply(Context context, String configurationName, Object value) {
+        ExLog.i(context, TAG, String.format("Applied '%s' configuration: %s.", configurationName, value == null ? "null" : value.toString()));
+    }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
index 84eaaa082da..0baed8f581e 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
@@ -104,7 +104,7 @@ public class RaceStateService extends Service {
         launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         PendingIntent contentIntent = PendingIntent.getActivity(this, 0, launcherIntent, 0);
         notificationBuilder = new NotificationCompat.Builder(this)
-            .setSmallIcon(R.drawable.ic_directions_boat)
+            .setSmallIcon(R.drawable.ic_boat_white_24dp)
             .setLargeIcon(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher))
             .setContentTitle(getText(R.string.service_info))
             .setContentText(getString(R.string.service_text_no_races))
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
index c63c8ed1635..fef49404e35 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
@@ -368,11 +368,6 @@ public class LoginActivity extends BaseActivity
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter);
 
         BroadcastManager.getInstance(this).addIntent(new Intent(AppConstants.INTENT_ACTION_CHECK_LOGIN));
-//        if (!TextUtils.isEmpty(AppPreferences.on(this).getServerBaseURL())) {
-//            resetData();
-//        } else {
-//            BroadcastManager.getInstance(this).addIntent(new Intent(AppConstants.INTENT_ACTION_SHOW_LOGIN));
-//        }
 
         int resultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(getApplicationContext());
 
@@ -381,7 +376,6 @@ public class LoginActivity extends BaseActivity
                 GooglePlayServicesUtil.getErrorDialog(resultCode, this, 1).show();
             }
         }
-
     }
 
     @Override
@@ -432,8 +426,8 @@ public class LoginActivity extends BaseActivity
             }
         });
 
-        if (!AppPreferences.on(this).isOfflineMode()) {
-            // always reload the configuration...
+        if (!preferences.isOfflineMode() && preferences.needConfigRefresh()) {
+            // reload the configuration if needed...
             getLoaderManager().restartLoader(0, null, configurationLoader).forceLoad();
         } else {
             dismissProgressSpinner();
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/PreferenceActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/PreferenceActivity.java
index dad3aca13a4..56d01d3c068 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/PreferenceActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/PreferenceActivity.java
@@ -25,7 +25,6 @@ import com.sap.sailing.racecommittee.app.domain.configuration.impl.PreferencesRe
 import com.sap.sailing.racecommittee.app.ui.fragments.MainPreferenceFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaPreferenceFragment;
 import com.sap.sailing.racecommittee.app.utils.PreferenceHelper;
-import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
 
 public class PreferenceActivity extends AppCompatActivity {
 
@@ -80,7 +79,6 @@ public class PreferenceActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         AppUtils.lockOrientation(this);
-        ThemeHelper.setTheme(this);
         setContentView(R.layout.preference_view);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/MainPreferenceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/MainPreferenceFragment.java
index cd034a2631a..a855230d09a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/MainPreferenceFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/MainPreferenceFragment.java
@@ -1,19 +1,41 @@
 package com.sap.sailing.racecommittee.app.ui.fragments;
 
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
 import android.app.Fragment;
+import android.app.LoaderManager;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.DrawableRes;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.sap.sailing.android.shared.logging.ExLog;
+import com.sap.sailing.android.shared.util.ViewHelper;
+import com.sap.sailing.domain.base.configuration.DeviceConfiguration;
+import com.sap.sailing.domain.base.configuration.DeviceConfigurationIdentifier;
+import com.sap.sailing.domain.base.configuration.impl.DeviceConfigurationIdentifierImpl;
+import com.sap.sailing.racecommittee.app.AppPreferences;
 import com.sap.sailing.racecommittee.app.R;
+import com.sap.sailing.racecommittee.app.data.DataManager;
+import com.sap.sailing.racecommittee.app.data.clients.LoadClient;
+import com.sap.sailing.racecommittee.app.domain.configuration.impl.PreferencesDeviceConfigurationLoader;
+import com.sap.sailing.racecommittee.app.ui.views.decoration.PreferenceMarginItemDecoration;
 
-public class MainPreferenceFragment extends LoggableFragment implements OnClickListener {
+public class MainPreferenceFragment extends LoggableFragment {
 
     private static final String TAG = MainPreferenceFragment.class.getName();
 
@@ -27,41 +49,143 @@ public class MainPreferenceFragment extends LoggableFragment implements OnClickL
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        RelativeLayout layout = (RelativeLayout) inflater.inflate(R.layout.preference_header, container, false);
+        View layout = inflater.inflate(R.layout.preference_header, container, false);
 
-        for (int i = 0; i < layout.getChildCount(); i++) {
-            Button button = (Button) layout.getChildAt(i);
-            button.setTextColor(getResources().getColor(R.color.white));
-            if (button != null) {
-                button.setOnClickListener(this);
-            }
+        RecyclerView recyclerView = ViewHelper.get(layout, R.id.preference_header);
+        if (recyclerView != null) {
+            ArrayList<PreferenceItem> items = new ArrayList<>();
+            items
+                .add(new PreferenceItem(getString(R.string.settings_category_general), R.drawable.ic_more_horiz_yellow_24dp, "com.sap.sailing.racecommittee.app.ui.fragments.preference.GeneralPreferenceFragment"));
+            items
+                .add(new PreferenceItem(getString(R.string.settings_category_regatta_defaults), R.drawable.ic_boat_yellow_24dp, "com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaPreferenceFragment"));
+            items
+                .add(new PreferenceItem(getString(R.string.settings_category_regattas), R.drawable.ic_boat_yellow_24dp, "com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaSpecificPreferenceFragment"));
+            items
+                .add(new PreferenceItem(getString(R.string.settings_category_course_designer), R.drawable.ic_pin_drop_yellow_24dp, "com.sap.sailing.racecommittee.app.ui.fragments.preference.CourseDesignerPreferenceFragment"));
+            items.add(new PreferenceItem(getString(R.string.reload_config), R.drawable.ic_autorenew_yellow_24dp, new Runnable() {
+                @Override
+                public void run() {
+                    DeviceConfigurationIdentifier identifier = new DeviceConfigurationIdentifierImpl(AppPreferences.on(getActivity())
+                        .getDeviceIdentifier());
+
+                    LoaderManager.LoaderCallbacks<?> configurationLoader = DataManager.create(getActivity()).createConfigurationLoader(identifier, new LoadClient<DeviceConfiguration>() {
+
+                        @Override
+                        public void onLoadFailed(Exception reason) {
+                            if (reason instanceof FileNotFoundException) {
+                                Toast.makeText(getActivity(), getString(R.string.loading_configuration_not_found), Toast.LENGTH_LONG).show();
+                                ExLog.w(getActivity(), TAG, String.format("There seems to be no configuration for this device: %s", reason.toString()));
+                            } else {
+                                Toast.makeText(getActivity(), getString(R.string.loading_configuration_failed), Toast.LENGTH_LONG).show();
+                                ExLog.ex(getActivity(), TAG, reason);
+                            }
+                        }
+
+                        @Override
+                        public void onLoadSucceeded(DeviceConfiguration configuration, boolean isCached) {
+                            // this is our 'global' configuration, let's store it in app preferences
+                            PreferencesDeviceConfigurationLoader.wrap(configuration, AppPreferences.on(getActivity())).store();
+
+                            Toast.makeText(getActivity(), getString(R.string.loading_configuration_succeded), Toast.LENGTH_LONG).show();
+                        }
+                    });
+
+                    getLoaderManager().initLoader(0, null, configurationLoader).forceLoad();
+                }
+            }));
+            recyclerView.addItemDecoration(new PreferenceMarginItemDecoration(getActivity(), getResources().getDimensionPixelSize(R.dimen.preference_margin)));
+            recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), getResources().getInteger(R.integer.preference_columns)));
+            recyclerView.setAdapter(new PreferenceAdapter(getActivity(), items));
         }
 
         return layout;
     }
 
-    @Override
-    public void onPause() {
-        super.onPause();
+    private class PreferenceAdapter extends RecyclerView.Adapter<PreferenceViewHolder> {
+
+        private Context mContext;
+        private List<PreferenceItem> mItems;
+
+        public PreferenceAdapter(Context context, List<PreferenceItem> items) {
+            mContext = context;
+            mItems = items;
+        }
+
+        @Override
+        public PreferenceViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View layout = LayoutInflater.from(mContext).inflate(R.layout.pref_header, parent, false);
+            return new PreferenceViewHolder(layout);
+        }
+
+        @Override
+        public void onBindViewHolder(PreferenceViewHolder holder, int position) {
+            holder.item = mItems.get(position);
+            holder.textView.setText(holder.item.title);
+            holder.textView.setCompoundDrawablesWithIntrinsicBounds(holder.item.drawable, null, null, null);
+            holder.line.setVisibility(TextUtils.isEmpty(holder.item.clazz) ? View.GONE : View.VISIBLE);
+        }
+
+        @Override
+        public int getItemCount() {
+            return (mItems != null) ? mItems.size() : 0;
+        }
     }
 
-    @Override
-    public void onClick(View view) {
-        if (view != null && view instanceof Button) {
-            String tag = (String) view.getTag();
-            if (tag != null) {
-                try {
-                    Fragment fragment = (Fragment) Class.forName(tag).newInstance();
-                    ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(((Button) view).getText());
-                    getFragmentManager().beginTransaction().replace(R.id.content_frame, fragment).addToBackStack(null).commit();
-                } catch (ClassNotFoundException ex) {
-                    ExLog.ex(getActivity(), TAG, ex);
-                } catch (java.lang.InstantiationException ex) {
-                    ExLog.ex(getActivity(), TAG, ex);
-                } catch (IllegalAccessException ex) {
-                    ExLog.ex(getActivity(), TAG, ex);
+    private class PreferenceViewHolder extends RecyclerView.ViewHolder {
+
+        public PreferenceItem item;
+        public TextView textView;
+        public View line;
+
+        public PreferenceViewHolder(final View itemView) {
+            super(itemView);
+
+            textView = (TextView) itemView.findViewById(R.id.preference_title);
+            line = itemView.findViewById(R.id.preference_line);
+            itemView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (TextUtils.isEmpty(item.clazz)) {
+                        Handler handler = new Handler();
+                        handler.post(item.runnable);
+                    } else {
+                        try {
+                            Fragment fragment = (Fragment) Class.forName(item.clazz).newInstance();
+                            ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(item.title);
+                            getFragmentManager().beginTransaction().replace(R.id.content_frame, fragment).addToBackStack(null).commit();
+                        } catch (ClassNotFoundException ex) {
+                            ExLog.ex(getActivity(), TAG, ex);
+                        } catch (java.lang.InstantiationException ex) {
+                            ExLog.ex(getActivity(), TAG, ex);
+                        } catch (IllegalAccessException ex) {
+                            ExLog.ex(getActivity(), TAG, ex);
+                        }
+                    }
                 }
-            }
+            });
+        }
+    }
+
+    private class PreferenceItem {
+
+        public String title;
+        public Drawable drawable;
+        public String clazz;
+        public Runnable runnable;
+
+        private PreferenceItem(String title, @DrawableRes int drawable) {
+            this.title = title;
+            this.drawable = ContextCompat.getDrawable(getActivity(), drawable);
+        }
+
+        public PreferenceItem(String title, @DrawableRes int drawable, String clazz) {
+            this(title, drawable);
+            this.clazz = clazz;
+        }
+
+        public PreferenceItem(String title, @DrawableRes int drawable, Runnable runnable) {
+            this(title, drawable);
+            this.runnable = runnable;
         }
     }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
index 37c2d178f64..687113585c6 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
@@ -108,11 +108,12 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
         addOnPreferenceChangeListener(serverUrlPreference, new OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
+                AppPreferences.on(getActivity()).setNeedConfigRefresh(true);
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog);
                 builder.setTitle(getString(R.string.url_refresh_title));
                 builder.setMessage(getString(R.string.url_refresh_message));
                 builder.setPositiveButton(android.R.string.ok, null);
-                builder.create().show();
+                builder.show();
                 return true;
             }
         });
@@ -183,6 +184,7 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
         if (resultCode == Activity.RESULT_OK) {
             QRHelper.with(getActivity()).saveData(data.getStringExtra("SCAN_RESULT"));
 
+                    AppPreferences.on(getActivity()).setNeedConfigRefresh(true);
 
         } else {
             Toast.makeText(getActivity(), getString(R.string.error_scanning_qr, resultCode), Toast.LENGTH_LONG).show();
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/decoration/PreferenceMarginItemDecoration.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/decoration/PreferenceMarginItemDecoration.java
new file mode 100644
index 00000000000..9b063415841
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/decoration/PreferenceMarginItemDecoration.java
@@ -0,0 +1,67 @@
+package com.sap.sailing.racecommittee.app.ui.views.decoration;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.sap.sailing.racecommittee.app.R;
+
+public class PreferenceMarginItemDecoration extends RecyclerView.ItemDecoration {
+
+    private int mMargin;
+    private Drawable mBackground;
+    private int mItemHeight;
+
+    public PreferenceMarginItemDecoration(Context context, int margin) {
+        mMargin = margin;
+        mBackground = new ColorDrawable(context.getResources().getColor(R.color.light_sap_gray_black_30));
+        mItemHeight = context.getResources().getDimensionPixelSize(R.dimen.preference_item_height);
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        super.onDraw(c, parent, state);
+
+        int spanCount = getSpanCount(parent);
+        int rowCount = parent.getChildCount();
+        if (spanCount % 2 == 0) {
+            if (rowCount % 2 != 0) {
+                rowCount = (rowCount + 1) / 2;
+            }
+        }
+        mBackground.setBounds(0, 0, parent.getWidth(), mItemHeight * rowCount);
+        mBackground.draw(c);
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+
+        int spanCount = getSpanCount(parent);
+        int marginLeft = mMargin;
+        int marginRight = mMargin;
+        if (spanCount != 1) {
+            int pos = parent.getChildLayoutPosition(view) + 1;
+            if (pos % 2 == 0) {
+                marginLeft = marginLeft / 2;
+            } else {
+                marginRight = marginRight / 2;
+            }
+        }
+        outRect.set(marginLeft, 0, marginRight, 0);
+    }
+
+    private int getSpanCount(RecyclerView parent) {
+        int spanCount = 1;
+        RecyclerView.LayoutManager layoutManager = parent.getLayoutManager();
+        if (layoutManager instanceof GridLayoutManager) {
+            spanCount = ((GridLayoutManager) layoutManager).getSpanCount();
+        }
+        return spanCount;
+    }
+}