Removed popup on save, replaced icons