Update icon to have color
Update custom icons and corresponding code