Port of 24895-branch-index-delete-button-inconsistently-spaced-and-misaligned to EE
requested to merge 24895-branch-index-delete-button-inconsistently-spaced-and-misaligned-ee into master
fixes conflicts with the EE branch
see gitlab-ce#24895 and gitlab-ce!8646