Comment out new changes for new icons (since not implemented yet, and screwed up placement for now)