Verbage, widget icon placement, misc changes
Merge remote-tracking branch 'github/master'