Improve swatch clickable areas, remove corner paddings