diff --git a/java/com.sap.sailing.gwt.ui/build.properties b/java/com.sap.sailing.gwt.ui/build.properties
index dce51fb9065..db5af9e163b 100644
--- a/java/com.sap.sailing.gwt.ui/build.properties
+++ b/java/com.sap.sailing.gwt.ui/build.properties
@@ -54,5 +54,6 @@ bin.includes = META-INF/,\
                licenses/,\
                PairingList.css,\
                PairingList.html,\
-               com.sap.sailing.gwt.ui.PairingList/
+               com.sap.sailing.gwt.ui.PairingList/,\
+               src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/
 output.. = WEB-INF/classes/
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java
index 2c2d3dd4481..ce7e26637dc 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java
@@ -83,7 +83,7 @@ public class BoatClassImageResolver {
         boatClassIconsMap.put(BoatClassMasterdata.LASER_2.getDisplayName(), imageResources.Laser2Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LASER_SB3.getDisplayName(), imageResources.LaserSB3Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LASER_INT.getDisplayName(), imageResources.LaserIcon());
-        boatClassIconsMap.put(BoatClassMasterdata.LASER_4_7.getDisplayName(), imageResources.LaserIcon());
+        boatClassIconsMap.put(BoatClassMasterdata.LASER_4_7.getDisplayName(), imageResources.Laser47Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LASER_RADIAL.getDisplayName(), imageResources.LaserIcon());
         boatClassIconsMap.put(BoatClassMasterdata.LAGO_26.getDisplayName(), imageResources.Lago26Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LONGTZE.getDisplayName(), imageResources.LongtzeIcon());
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java
index 40efca2dfd9..d9ebbc3acb4 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java
@@ -36,7 +36,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource _470Icon();
     
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/49ER_FX.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/49ERFX.png")
     @ImageOptions(preventInlining = true)
     ImageResource _49erFXIcon();
 
@@ -48,7 +48,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource _505mIcon();
     
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/5.5mR.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/5_5MR.png")
     @ImageOptions(preventInlining = true)
     ImageResource _5_5MRIcon();
     
@@ -192,7 +192,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource J111Icon();
 
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER2.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER_2.png")
     @ImageOptions(preventInlining = true)
     ImageResource Laser2Icon();
    
@@ -200,10 +200,14 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource LaserSB3Icon();
    
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png")
     @ImageOptions(preventInlining = true)
     ImageResource LaserIcon();
 
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER_4_7.png")
+    @ImageOptions(preventInlining = true)
+    ImageResource Laser47Icon();
+
     @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LAGO_26.png")
     @ImageOptions(preventInlining = true)
     ImageResource Lago26Icon();
@@ -288,7 +292,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource StreamlineIcon();
     
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM22.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM_22.png")
     @ImageOptions(preventInlining = true)
     ImageResource Sunbeam22Icon();
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ER_FX.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ERFX.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ER_FX.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ERFX.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5.5mR.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5_5MR.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5.5mR.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5_5MR.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER2.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_2.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER2.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_2.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_4_7.png
old mode 100644
new mode 100755
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_4_7.png
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png
new file mode 100644
index 00000000000..39c2d280750
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM22.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM_22.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM22.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM_22.png
diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java
index 3335accf133..ee5807a9a7f 100644
--- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java
@@ -1,19 +1,38 @@
 package com.sap.sailing.server.gateway.serialization.impl;
 
+import java.util.Arrays;
+
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
 import com.sap.sailing.domain.base.BoatClass;
+import com.sap.sailing.domain.common.BoatClassMasterdata;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 
 public class BoatClassJsonSerializer implements JsonSerializer<BoatClass> {
     public static final String FIELD_NAME = "name";
     public static final String FIELD_TYPICALLY_STARTS_UPWIND = "typicallyStartsUpwind";
-
+    public static final String FIELD_HULL_LENGTH_IN_METERS = "hullLengthInMeters";
+    public static final String FIELD_HULL_BEAM_IN_METERS = "hullBeamInMeters";
+    public static final String FIELD_DISPLAY_NAME = "displayName";
+    public static final String FIELD_ALIAS_NAMES = "aliasNames";
+    public static final String FIELD_ICON_URL = "iconUrl";
+    
     @Override
     public JSONObject serialize(BoatClass boatClass) {
         JSONObject result = new JSONObject();
         result.put(FIELD_NAME, boatClass.getName());
         result.put(FIELD_TYPICALLY_STARTS_UPWIND, boatClass.typicallyStartsUpwind());
+        result.put(FIELD_HULL_LENGTH_IN_METERS, boatClass.getHullLength().getMeters());
+        result.put(FIELD_HULL_BEAM_IN_METERS, boatClass.getHullBeam().getMeters());
+        result.put(FIELD_DISPLAY_NAME, boatClass.getDisplayName());
+        final BoatClassMasterdata masterData = BoatClassMasterdata.resolveBoatClass(boatClass.getDisplayName());
+        final JSONArray aliasNames = new JSONArray();
+        if (masterData != null) {
+            result.put(FIELD_ICON_URL, "/gwt/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/"+masterData.name().replaceAll("^_", "")+".png");
+            aliasNames.addAll(Arrays.asList(masterData.getAlternativeNames()));
+        }
+        result.put(FIELD_ALIAS_NAMES, aliasNames);
         return result;
     }
 }