Merge "Revert color-coded icons."