Minor to-do items, added icons to all remaining forms