Fixes #902 Smilies Improvements

Remove self inflicted security vulnerability... :wink:
Fixes #902 Smilies Improvements

Resolve merge conflicts.