Improved icon and corrected sms author
Merge remote-tracking branch 'origin/develop' into develop