Changed the design and the behavior of the marker icons
Merge branch 'master' into showcase