Added icon and icon_size marker options.
Changed iconsize to icon_size in template.