Add i18n support
Restore removed icon