Icons research

Review would be great... sorry, it's a bit long ... icons support is f'ing screwed on the platform :(