Issue 339: Buttons are changed to icons, need to remove the background box