Swapped icons for sprite, cleaned some freemarker