Added new icons and renamed cancel button