Move some code from run into icons