Emoji button misplaces

This was working as it should be with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10130

Currently i see some glitches like this:

cc: @annabeldunstone @psimyn