Fix buttons. Right order and changed the icon