Working on Icon loading

Icon is still broken but it doesn't give errors.