Marker does not appear

This is related to the patch provided in this issue : https://www.drupal.org/node/2125493

The commit of this patch in the dev branch causes the marker to find a 404 response for the marker image request in my case. If I apply the patch below, everything works as expected, except I think it breaks what was supposed to be fixed in the previous issue.