merged settings import/export and new icons