Adding tab templates, linking icons