Updated Icon and layout