Update to include images for buttons instead of text
Merge remote-tracking branch 'origin/master'