Pre style merge
Icons, Dan's style edits