issue6724: changed margin to padding to enlarge the clickable area