Modify navigation icons
Fix ImageDisplay overlay icons