Removing the unneeded negative margin trick used to position icons.

This fixes issue #9965.

I also fix #9987 in this pull request since it is showing the left edge of the focus ring with the fix for #9965.