Update Custom Icons & fix