New icons, cleaned interaction and code a bit.