Revert c0f8856742a.
It made icon positioning on drop behave extremely erratically in practice, and unfortunately it went ignoring review comments.