Disabled modify_icon so that diffs don't need modification.
IconMerger methods are no longer static.