diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
index 12fe41895b9..7798dd00600 100644
--- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
@@ -48,7 +48,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.server.gateway.serialization.shared.android,
  com.sap.sse.shared.android,
  com.sap.sse.filestorage,
- com.sun.jersey.contribs.jersey-multipart;bundle-version="1.17.1",
+ com.sun.jersey.contribs.jersey-multipart;bundle-version="1.17.0",
  com.sap.sse.security,
  org.apache.shiro.core;bundle-version="1.2.2",
  org.apache.shiro.web;bundle-version="1.2.2",
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java
index 40ceb741e09..0fa71f32ea4 100755
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/FileStorageResource.java
@@ -9,12 +9,12 @@ import java.util.logging.Logger;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
-import javax.ws.rs.HeaderParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
@@ -24,6 +24,8 @@ import com.sap.sailing.server.gateway.jaxrs.AbstractSailingServerResource;
 import com.sap.sse.common.NoCorrespondingServiceRegisteredException;
 import com.sap.sse.filestorage.InvalidPropertiesException;
 import com.sap.sse.filestorage.OperationFailedException;
+import com.sun.jersey.multipart.FormDataBodyPart;
+import com.sun.jersey.multipart.FormDataParam;
 
 @Path("/v1/file")
 public class FileStorageResource extends AbstractSailingServerResource {
@@ -45,37 +47,36 @@ public class FileStorageResource extends AbstractSailingServerResource {
     //     --data-binary @<path-to-local-jpg> \
     //     http://127.0.0.1:8888/sailingserver/api/v1/file
     @POST
-    @Consumes({ "image/jpeg", "image/png" })
-    @Produces("application/json;charset=UTF-8")
-    public Response setTeamImage(InputStream uploadedInputStream,
-            @HeaderParam("Content-Type") String fileType, @HeaderParam("Content-Length") long sizeInBytes) {
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    @Produces("text/html;charset=UTF-8")
+    public String uploadFile(@FormDataParam("file") InputStream uploadedInputStream, @FormDataParam("file") FormDataBodyPart filePart) {
         final JSONObject result = new JSONObject();
-        Response response;
         String fileExtension = "";
-        if (fileType.equals("image/jpeg")) {
-            fileExtension = ".jpg";
-        } else if (fileType.equals("image/png")) {
-            fileExtension = ".png";
+        MediaType fileType = filePart.getMediaType();
+        if (fileType.getType().equals("image")) {
+            if (fileType.getSubtype().equals("jpeg")) {
+                fileExtension = ".jpg";
+            } else if (fileType.getSubtype().equals("png")) {
+                fileExtension = ".png";
+            }
         }
 
         URI fileUri;
         try {
-            if (sizeInBytes > 1024 * 1024 * MAX_SIZE_IN_MB) {
+            if (filePart.getContentDisposition().getSize() > 1024 * 1024 * MAX_SIZE_IN_MB) {
                 throw new WebApplicationException(Response.status(Status.BAD_REQUEST)
                         .entity("Image is larger than " + MAX_SIZE_IN_MB + "MB").build());
             }
             fileUri = getService().getFileStorageManagementService().getActiveFileStorageService()
-                    .storeFile(uploadedInputStream, fileExtension, sizeInBytes);
+                    .storeFile(uploadedInputStream, fileExtension, filePart.getContentDisposition().getSize());
             result.put(JSON_FILE_URI, fileUri.toString());
-            response = Response.ok().entity(result.toJSONString()).build();
         } catch (IOException | OperationFailedException | InvalidPropertiesException e) {
             final String errorMessage = "Could not store file: "+e.getMessage();
             logger.log(Level.WARNING, "Could not store file", e);
             result.put("status", Status.INTERNAL_SERVER_ERROR.name());
             result.put("message", errorMessage);
-            response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(result.toJSONString()).build();
         }
-        return response;
+        return result.toJSONString();
     }
     
     // Example test use:
diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
index a960807da65..cd5cd12d1b6 100755
--- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
@@ -128,7 +128,7 @@
          id="com.sun.jersey.contribs.jersey-multipart"
          download-size="0"
          install-size="0"
-         version="1.17.1"
+         version="1.17.0"
          unpack="false"/>
 
    <plugin
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.1.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.jar
old mode 100644
new mode 100755
similarity index 77%
rename from java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.1.jar
rename to java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.jar
index f469e3948a3..34662e65646
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.1.jar and b/java/com.sap.sailing.targetplatform.base/plugins/target-base/jersey-multipart-1.17.jar differ
diff --git a/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java b/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
index 319dacf98f4..180cf511eb6 100755
--- a/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
+++ b/java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
@@ -53,17 +53,21 @@ public class URLFieldWithFileUpload extends HorizontalPanel {
                 removePanel.submit();
             }
         });
+        removePanel.add(removeButton);
         urlTextBox = new TextBox();
         add(urlTextBox);
         FormPanel formPanel = new FormPanel();
+        HorizontalPanel formPanelContent = new HorizontalPanel();
+        formPanel.add(formPanelContent);
         formPanel.setAction("/sailingserver/api/v1/file");
         formPanel.setEncoding(FormPanel.ENCODING_MULTIPART);
         formPanel.setMethod(FormPanel.METHOD_POST);
         fileUploadField = new FileUpload();
+        formPanelContent.add(fileUploadField);
         final InputElement inputElement = fileUploadField.getElement().cast();
         inputElement.setName("file");
         SubmitButton submitButton = new SubmitButton(stringMessages.upload());
-        formPanel.add(submitButton);
+        formPanelContent.add(submitButton);
         add(formPanel);
         formPanel.addSubmitCompleteHandler(new SubmitCompleteHandler() {
             @Override
@@ -77,6 +81,7 @@ public class URLFieldWithFileUpload extends HorizontalPanel {
                 }
             }
         });
+        add(removePanel);
     }
 
     private void enableDelete() {