Ticket #1872 and #1873: Fixes for navigation icons.