Refactored strings and added a confirmation on the apply button
New icon