diff --git a/java/com.sap.sailing.gwt.ui/images/mobile/raw_gps_fixes.svg b/java/com.sap.sailing.gwt.ui/images/mobile/raw_gps_fixes.svg
index 01aece1913e..321f89307b9 100644
--- a/java/com.sap.sailing.gwt.ui/images/mobile/raw_gps_fixes.svg
+++ b/java/com.sap.sailing.gwt.ui/images/mobile/raw_gps_fixes.svg
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="841.889px" height="595.281px" viewBox="0 0 841.889 595.281" enable-background="new 0 0 841.889 595.281"
-	 xml:space="preserve">
+	 viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
 <g>
 	<g>
 		<g>
 			<g>
-				<path fill="#008ECB" d="M289.695,245.788c1.984,0,1.984,0,3.97,0c5.952,1.984,9.921,9.921,7.937,15.874
-					c-15.874,47.623-3.969,101.198,29.766,134.932c35.717,35.717,87.308,47.622,134.929,31.748
-					c5.953-1.984,13.891,1.983,15.875,7.938c1.983,5.952-1.984,13.891-7.938,15.874c-55.559,19.843-119.056,5.952-160.725-37.701
-					c-41.67-41.67-55.56-105.166-35.717-162.71C279.773,249.757,283.742,245.788,289.695,245.788z"/>
-				<path fill="#008ECB" d="M331.365,259.677c1.983,0,1.983,0,3.969,0c5.953,1.983,9.922,9.922,7.938,15.873
-					c-11.905,31.75-3.969,67.467,19.843,91.276c23.812,23.812,57.544,31.749,89.292,19.844c5.951-1.984,13.89,1.983,15.873,7.938
-					c1.984,5.952-1.983,13.89-7.938,15.874c-41.668,13.89-85.323,3.969-117.071-25.796c-29.764-29.764-41.67-75.401-25.796-117.071
-					C321.443,263.646,325.412,259.677,331.365,259.677z"/>
-				<path fill="#008ECB" d="M371.05,275.552c1.984,0,1.984,0,3.969,0c5.953,1.983,9.922,9.922,7.938,15.873
-					c-5.953,15.876-1.984,33.733,9.921,45.64c11.906,11.905,29.765,15.874,45.638,9.921c5.954-1.982,13.891,1.984,15.875,7.938
-					c1.981,5.953-1.984,13.89-7.938,15.874c-25.795,7.938-51.591,1.983-71.434-15.874c-17.857-17.858-25.795-47.622-15.874-71.435
-					C361.129,277.536,367.082,275.552,371.05,275.552z"/>
+				<path fill="#008ECB" d="M22.2,17.6c-0.1,0-0.1,0-0.2,0c-0.3-0.1-0.5-0.5-0.4-0.8c0.8-2.4,0.2-5.1-1.5-6.8
+					c-1.8-1.8-4.4-2.4-6.8-1.6c-0.3,0.1-0.7-0.1-0.8-0.4c-0.1-0.3,0.1-0.7,0.4-0.8c2.8-1,6-0.3,8.1,1.9c2.1,2.1,2.8,5.3,1.8,8.2
+					C22.7,17.4,22.5,17.6,22.2,17.6z"/>
+				<path fill="#008ECB" d="M20.1,16.9c-0.1,0-0.1,0-0.2,0c-0.3-0.1-0.5-0.5-0.4-0.8c0.6-1.6,0.2-3.4-1-4.6c-1.2-1.2-2.9-1.6-4.5-1
+					c-0.3,0.1-0.7-0.1-0.8-0.4c-0.1-0.3,0.1-0.7,0.4-0.8c2.1-0.7,4.3-0.2,5.9,1.3c1.5,1.5,2.1,3.8,1.3,5.9
+					C20.6,16.7,20.4,16.9,20.1,16.9z"/>
+				<path fill="#008ECB" d="M18.1,16.1c-0.1,0-0.1,0-0.2,0c-0.3-0.1-0.5-0.5-0.4-0.8c0.3-0.8,0.1-1.7-0.5-2.3
+					c-0.6-0.6-1.5-0.8-2.3-0.5c-0.3,0.1-0.7-0.1-0.8-0.4c-0.1-0.3,0.1-0.7,0.4-0.8c1.3-0.4,2.6-0.1,3.6,0.8c0.9,0.9,1.3,2.4,0.8,3.6
+					C18.6,16,18.3,16.1,18.1,16.1z"/>
 			</g>
 		</g>
 	</g>
-	<path fill="#008ECB" d="M390.892,166.417c41.67-41.669,130.962-49.605,180.567,0c49.607,49.606,41.671,136.915,0,180.568
-		L390.892,166.417z"/>
+	<path fill="#008ECB" d="M17.1,21.6c-2.1,2.1-6.6,2.5-9.1,0s-2.1-6.9,0-9.1L17.1,21.6z"/>
 </g>
 </svg>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/EventStatisticsDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/EventStatisticsDTO.java
index d1df16b3951..e75550bdd09 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/EventStatisticsDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/EventStatisticsDTO.java
@@ -9,22 +9,20 @@ import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.Util.Triple;
 
 public class EventStatisticsDTO implements DTO {
-
     private Integer regattasFoughtCount;
     private Integer competitorsCount;
     private Integer racesRunCount;
     private Integer trackedRacesCount;
-
     private long numberOfGPSFixes;
     private long numberOfWindFixes;
     private String competitorInfo;
-    private String competitorSpeed;
-    private Distance totalDistanceTraveled;
-    
+    private Double competitorSpeedInKnots;
+    private Double totalDistanceTraveled;
+
     @SuppressWarnings("unused")
     private EventStatisticsDTO() {
     }
-    
+
     @GwtIncompatible
     public EventStatisticsDTO(Integer regattasFoughtCount, Integer competitorsCount, Integer racesRunCount,
             Integer trackedRacesCount, long numberOfGPSFixes, long numberOfWindFixes,
@@ -36,9 +34,13 @@ public class EventStatisticsDTO implements DTO {
         this.trackedRacesCount = trackedRacesCount;
         this.numberOfGPSFixes = numberOfGPSFixes;
         this.numberOfWindFixes = numberOfWindFixes;
-        this.competitorInfo = maxSpeed.getA().getName();
-        this.competitorSpeed = maxSpeed.getB().getKnots() + "kn";
-        this.totalDistanceTraveled = totalDistanceTraveled;
+        if (maxSpeed != null) {
+            this.competitorInfo = maxSpeed.getA().getName();
+            this.competitorSpeedInKnots = maxSpeed.getB().getKnots();
+        }
+        if (totalDistanceTraveled != null) {
+            this.totalDistanceTraveled = totalDistanceTraveled.getSeaMiles();
+        }
     }
 
     public Integer getRegattasFoughtCount() {
@@ -73,7 +75,6 @@ public class EventStatisticsDTO implements DTO {
         this.trackedRacesCount = trackedRacesCount;
     }
 
-
     public long getNumberOfGPSFixes() {
         return numberOfGPSFixes;
     }
@@ -86,13 +87,11 @@ public class EventStatisticsDTO implements DTO {
         return competitorInfo;
     }
 
-    public String getCompetitorSpeed() {
-        return competitorSpeed;
+    public Double getCompetitorSpeed() {
+        return competitorSpeedInKnots;
     }
 
-    public Distance getTotalDistanceTraveled() {
+    public Double getTotalDistanceTraveled() {
         return totalDistanceTraveled;
     }
-
-
 }