[FEATURE] FileUploader icon handling

Change-Id: I2085c20a5282d3635905036d196c2c00c26c33f2
Merge "[FEATURE] FileUploader icon handling"