Rename icons
Clean up after change of strategy
Prepare for pusher