MIL-346 Move icon defs out of the header and into an external file
Resolving Merge Conflicts
Merge branch 'icon-management' into staging