[Autofill] Thematic changes

Similar to 3a3e7341a2e99cbbbc02572d2bbdf620392d8356