Merge "[SB][Misc] Move IconManager classes into their own files." into main