Use padding since margin is not a clickable area
Merge branch 'master' into 2.0.x