Correct icon names and locations