improved locks - fixes freezes on import config with custom icons