Fix icons, start work on adding Share form