Begin rewrite of icon overrides