Reversion of some breaking commits, addition of icon files and some
changes to wiring of Inbox Activity