New icons and fixed click listener.