Clean up buttons and icons