Code update, remove icons