Add icons and fix layout issue with share menu