add icons and update localization
Merge branch 'work'