Icons on buttons

A few more chafes to reflect blog entry