BUGFIX: Added menu icons(for those still stuck on Gingerbread)
BUGFIX: Added icons to the template editor menu for the sake of completeness.