Changed icon menu code, much better.