diff --git a/java/com.sap.sailing.gwt.ui/Leaderboard.css b/java/com.sap.sailing.gwt.ui/Leaderboard.css
index 28080806749..270d817cdc7 100755
--- a/java/com.sap.sailing.gwt.ui/Leaderboard.css
+++ b/java/com.sap.sailing.gwt.ui/Leaderboard.css
@@ -158,3 +158,10 @@ body, table td, select, button {
 .circleRed {
   background: #f01010;
 }
+
+.busyIndicator-Simple {
+	margin-top: 7px;	
+}
+
+.busyIndicator-Circle {
+}
diff --git a/java/com.sap.sailing.gwt.ui/RaceBoard.css b/java/com.sap.sailing.gwt.ui/RaceBoard.css
index 889f9dba932..f3daea67dce 100644
--- a/java/com.sap.sailing.gwt.ui/RaceBoard.css
+++ b/java/com.sap.sailing.gwt.ui/RaceBoard.css
@@ -371,3 +371,9 @@ img.openColumn {
   background: #f01010;
 }
 
+.busyIndicator-Simple {
+	margin-top: 7px;	
+}
+
+.busyIndicator-Circle {
+}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
index a11507698f5..94e90871dc9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
@@ -8,7 +8,6 @@ import java.util.Map;
 
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.dom.client.Style.VerticalAlign;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
@@ -39,12 +38,12 @@ import com.sap.sailing.gwt.ui.client.RaceTimesInfoProvider;
 import com.sap.sailing.gwt.ui.client.RegattaDisplayer;
 import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
 import com.sap.sailing.gwt.ui.client.StringMessages;
+import com.sap.sailing.gwt.ui.client.media.MediaSelector;
 import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorRaceChart;
 import com.sap.sailing.gwt.ui.client.shared.charts.WindChart;
 import com.sap.sailing.gwt.ui.client.shared.charts.WindChartSettings;
 import com.sap.sailing.gwt.ui.client.shared.components.Component;
 import com.sap.sailing.gwt.ui.client.shared.components.ComponentViewer;
-import com.sap.sailing.gwt.ui.client.media.MediaSelector;
 import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialog;
 import com.sap.sailing.gwt.ui.client.shared.filter.CompetitorRaceRankFilter;
 import com.sap.sailing.gwt.ui.client.shared.filter.CompetitorSelectionProviderFilterContext;
@@ -175,7 +174,6 @@ public class RaceBoardPanel extends SimplePanel implements RegattaDisplayer, Rac
 
         // add busy indicator to toolbar panel because the embedded leaderboard has no space for it
         toolbarPanel.add(leaderboardPanel.getBusyIndicator());
-        leaderboardPanel.getBusyIndicator().getElement().getStyle().setVerticalAlign(VerticalAlign.MIDDLE);
 
         CompetitorsFilterSets loadedCompetitorsFilterSets = loadCompetitorsFilterSets();
         if (loadedCompetitorsFilterSets != null) {
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/busyindicator/SimpleBusyIndicator.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/busyindicator/SimpleBusyIndicator.java
index 58ebb4d2fbc..573b8c58338 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/busyindicator/SimpleBusyIndicator.java
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/busyindicator/SimpleBusyIndicator.java
@@ -1,6 +1,5 @@
 package com.sap.sse.gwt.client.controls.busyindicator;
 
-import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.resources.client.ImageResource;
 import com.google.gwt.user.client.ui.Image;
 
@@ -24,13 +23,13 @@ public class SimpleBusyIndicator extends BusyIndicator {
      * @param scale Scales the displayed image. 1.0 is 100%, 0.50 is 50%, ...
      */
     public SimpleBusyIndicator(boolean busy, float scale) {
-        this.setStyleName(STYLE_NAME_PREFIX + "simpleBusyIndicator");
-        this.getElement().getStyle().setMarginTop(7, Unit.PX);
+        this.setStyleName(STYLE_NAME_PREFIX + "Simple");
         ImageResource resource = RESOURCES.busyIndicatorCircle();
         busyIndicator = new Image(resource.getSafeUri());
-        busyIndicator.setStyleName(STYLE_NAME_PREFIX + "busyIndicatorCircle");
+        busyIndicator.setStyleName(STYLE_NAME_PREFIX + "Circle");
         busyIndicator.setPixelSize((int) (resource.getWidth() * scale), (int) (resource.getHeight() * scale));
         add(busyIndicator);
+        
         setBusy(busy);
     }