MDL-59336 themes: change FA mapping for i/new