Merge "Improved files icon and activity label."