Icon merge fix