Bug 1027925 - Ensure that icon remove button is above the icon and give it extra padding to make it clickable.