Renamed icon layers for consistency