Better icons
Adding finish button