Merge bug 1050403 - visual polish for widget

Forgot to merge this when I landed on central last week.