Merge branch 'fix_icon_and_translations'