Update uses of Push/IconButtonWidget to ButtonWidget

Separated this commit form Ie74d98283c2b2fdd2 as it is causing
master to fail.

Change-Id: If4f6ee6c13a70afdf5653d1e83d71bfbdc80f9c0