TODO Change how icons are loaded