Some localization & icon fixes