Bug 1027925 - Ensure that icon remove button is above the icon and give it extra padding to make it clickable.
Merge pull request #20824 from lightsofapollo/bug-1027925

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