diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_change_role_white_48dp.png
deleted file mode 100644
index c29cb246f25..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-hdpi/ic_change_role_white_48dp.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_change_role_white_48dp.png
deleted file mode 100644
index e966f5104b8..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-mdpi/ic_change_role_white_48dp.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_change_role_white_48dp.png
deleted file mode 100644
index b811a20b301..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xhdpi/ic_change_role_white_48dp.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_change_role_white_48dp.png
deleted file mode 100644
index 02076b894fb..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxhdpi/ic_change_role_white_48dp.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_change_role_white_48dp.png b/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_change_role_white_48dp.png
deleted file mode 100644
index e4cf3914bd9..00000000000
Binary files a/mobile/com.sap.sailing.racecommittee.app/res/drawable-xxxhdpi/ic_change_role_white_48dp.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml
index 88b2d17c939..b77bf67bbb8 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_list_header_content.xml
@@ -26,7 +26,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_margin="@dimen/default_margin"
-        android:src="@drawable/ic_change_role_white_48dp"/>
+        android:src="@drawable/ic_refresh_white_48dp"/>
 
     <TextView
         android:id="@+id/regatta_data"
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/menu/options_menu.xml b/mobile/com.sap.sailing.racecommittee.app/res/menu/options_menu.xml
index f3b3e6c599d..1036e910bed 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/menu/options_menu.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/menu/options_menu.xml
@@ -3,17 +3,21 @@
 
     <item
         android:id="@+id/options_menu_reset"
-        android:title="@string/reset_race"/>
+        android:title="@string/reset_race" />
 
     <item
         android:id="@+id/options_menu_settings"
-        android:title="@string/options_menu_settings"/>
+        android:title="@string/options_menu_settings" />
 
     <item
         android:id="@+id/options_menu_info"
-        android:title="@string/options_menu_info"/>
+        android:title="@string/options_menu_info" />
+
+    <item
+        android:id="@+id/options_menu_role"
+        android:title="@string/options_menu_role" />
 
     <item
         android:id="@+id/options_menu_logout"
-        android:title="@string/logout"/>
+        android:title="@string/logout" />
 </menu>
\ 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 e1eee8695aa..29b4f4d7818 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
@@ -496,5 +496,6 @@
 
     <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="options_menu_role">Rolle wechseln</string>
 
 </resources>
\ No newline at end of file
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 82318e4453e..f98bb9f2525 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
@@ -524,4 +524,5 @@
 
     <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="options_menu_role">Change Regatta</string>
 </resources>
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
index 8c5cd7fd0b7..bd7b7a0f771 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
@@ -22,11 +22,13 @@ public class AppConstants {
     public final static String DARK_THEME = "dark";
     public final static String LIGHT_THEME = "light";
 
-    public final static String INTENT_ACTION_RESET = PACKAGE_NAME + ".action.reset";
-    public final static String INTENT_ACTION_REGISTER_RACE = PACKAGE_NAME + ".action.registerRace";
-    public final static String INTENT_ACTION_CLEAR_RACES = PACKAGE_NAME + ".action.clearRaces";
-    public final static String INTENT_ACTION_ALARM_ACTION = PACKAGE_NAME + ".action.alarmAction";
-    public final static String INTENT_ACTION_START_PROCEDURE_SPECIFIC_ACTION = PACKAGE_NAME + ".action.startProcedureSpecificAction";
+    private final static String INTENT_ACTION = PACKAGE_NAME + ".action";
+    public final static String INTENT_ACTION_RESET = INTENT_ACTION + ".reset";
+    public final static String INTENT_ACTION_REGISTER_RACE = INTENT_ACTION + ".registerRace";
+    public final static String INTENT_ACTION_CLEAR_RACES = INTENT_ACTION + ".clearRaces";
+    public final static String INTENT_ACTION_ALARM_ACTION = INTENT_ACTION + ".alarmAction";
+    public final static String INTENT_ACTION_RELOAD_RACES = INTENT_ACTION + ".reloadRaces";
+    public final static String INTENT_ACTION_START_PROCEDURE_SPECIFIC_ACTION = INTENT_ACTION + ".startProcedureSpecificAction";
 
     // Login activity
     public final static String EventIdTag = "EventId";
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
index b8f2a462cea..2a6d0d922bc 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
@@ -118,7 +118,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
         setProgressSpinnerVisibility(true);
 
         ExLog.i(this, TAG, "Issuing loading of managed races from data manager");
-        getLoaderManager().initLoader(RacesLoaderId, null, dataManager.createRacesLoader(courseArea.getId(), new RaceLoadClient(courseArea)));
+        getLoaderManager().initLoader(RacesLoaderId, null, dataManager.createRacesLoader(courseArea.getId(), new RaceLoadClient(courseArea))).forceLoad();
     }
 
     private boolean resetEditFragments(@IdRes int id, String action) {
@@ -246,6 +246,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
         filter.addAction(AppConstants.INTENT_ACTION_SHOW_MAIN_CONTENT);
         filter.addAction(AppConstants.INTENT_ACTION_SHOW_SUMMARY_CONTENT);
         filter.addAction(AppConstants.INTENT_ACTION_REMOVE_PROTEST);
+        filter.addAction(AppConstants.INTENT_ACTION_RELOAD_RACES);
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter);
     }
 
@@ -342,6 +343,10 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
                 resetRace();
                 return true;
 
+            case R.id.options_menu_role:
+                logoutSession();
+                return true;
+
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -553,6 +558,10 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
             }
         }
 
+        if (AppConstants.INTENT_ACTION_RELOAD_RACES.equals(action)) {
+            loadRaces(dataManager.getDataStore().getCourseArea(getCourseAreaIdFromIntent()));
+        }
+
         transaction.commit();
     }
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
index a143adaad97..639df723dfa 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceListFragment.java
@@ -55,7 +55,6 @@ import com.sap.sailing.racecommittee.app.data.DataManager;
 import com.sap.sailing.racecommittee.app.data.ReadonlyDataManager;
 import com.sap.sailing.racecommittee.app.domain.ManagedRace;
 import com.sap.sailing.racecommittee.app.domain.impl.RaceGroupSeriesFleet;
-import com.sap.sailing.racecommittee.app.ui.activities.RacingActivity;
 import com.sap.sailing.racecommittee.app.ui.activities.SessionActivity;
 import com.sap.sailing.racecommittee.app.ui.adapters.racelist.ManagedRaceListAdapter;
 import com.sap.sailing.racecommittee.app.ui.adapters.racelist.RaceListDataType;
@@ -270,7 +269,7 @@ public class RaceListFragment extends LoggableFragment implements OnItemClickLis
 
                 @Override
                 public void onClick(View v) {
-                    ((RacingActivity) getActivity()).logoutSession();
+                    BroadcastManager.getInstance(getActivity()).addIntent(new Intent(AppConstants.INTENT_ACTION_RELOAD_RACES));
                 }
             });
         }