Tweaks to upload indicator and icons