Swapped border for box-shadow; Chrome on Windows didn't like my round borders...
Merge branch 'hotfix/2.2.1'