Temporal file icons from iOS app
Merge branch 'master' into temporal_icons
Merge branch 'master' into temporal_icons