Fixed icons in toolbar
In progress updates for unified translation system