Custom Icon Conflict Resolution