replaced margins with paddings for remove icon for easier tapping