Added icon sizes. Cleanups.