Tweak add icon.
Screen cycling and removing.
Cleanup. Make hydra work again.