Minor tweaks to Iconic template