Change buttons to use font-based icons.
Fix merge conflicts.