cleanup and moving icons