Button text, field icon aligned more consistently