Changed icon naming scheme, added extension icons