Backport of PR #158 (URL shortener) to 0.9.x branch
Contains new icon from PR #922