Revert "Oops"

This reverts commit b716f802f3a2d27610af4d29a60292efa1fcbf95.
Revert "Set padding-right correctly instead of moving the clear icon"

This reverts commit 5c057459859f470033dac550ead560283c7676e1.