Fixing null bug.  Also adding icon