Bug 11559: (QA followup) replace font choices, fix macro editor