Icon Changes, Code cleanup