Fix Icons Problem and Add Changing Num Back