Upload and icon handling