Add icons to sort
Condense email form
Merge pull request #2589 from ten24/feature-fix-upload-btns

Feature fix upload btns