Port of 24895-branch-index-delete-button-inconsistently-spaced-and-misaligned-ee
requested to merge 24895-branch-index-delete-button-inconsistently-spaced-and-misaligned-ee into master
Attempt No. 2 because rake ee_compat_check is still complaining for some reason...