fix text/icon rendering order (#470)