Warning almost done, just need to re-include the icon inside sub itself