Move icons back to components