Add white and clean up layout and button icons