Revert removal of icon padding (fixes #514)