Pulls out Shealy's icon changes again in prep. for "templates" branch merge.