Feature/improve emoticon handling

Please help to review

T