Ui/new icons

https://www.pivotaltracker.com/story/show/58868066