New design for buttons
Merge branch 'firfir'