Added icon extensions (but this will probably need to be reworked).