Minor change
Added i18n and replaced TextButton by ToolbarButton